From nobody Mon Dec 29 17:07:14 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dg2hM1lsWz6M3mJ for ; Mon, 29 Dec 2025 17:07:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dg2hL51HFz46qQ for ; Mon, 29 Dec 2025 17:07:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767028034; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6lirmJSlSx18/moTueoOHKyut+RMSI2QfuHGDdmU/GU=; b=C85MdnLgWaw0Q/kyNMDmIIDZRzlVxtgdNB+u2r91A6bU1bp6R2/wELL4wIYuyzZsTbCs/w UBcpnVKkbfAghFrkphzqUaaA1Up8ZJoJXx5H2naUyalBWSzW/w8MxKyFNDoGF/NWHWnmgN AJu6QL5Pso12CQjV6lIa0Hppfk4j50EOPHRavI9jVSkpC0WVmu3kLvRjn5romwtCiQE09c SyBSdC6BKVuTYKRTN6H/vEj3t3xgQh5f0EdN2oPxxj2mOvNRmRkXe9k49s6RjYBtNyjJGE exemEXpCj/fL9uqZcqQxideZIO2BPrFkHt6dwT2NqYtpn9N7wjzr4ZSer3WxbA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767028034; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6lirmJSlSx18/moTueoOHKyut+RMSI2QfuHGDdmU/GU=; b=R0/5ru7BliXXt1Z0C4VutkdHsvDzaMwYfpabuV0D8+aIr+6CZJP4iy43pVPbcHtkwyVsve 14ttOsulYFxgsw5Nx//XcrpTdv3igeKDDKIeKAvx44YzuOZpW6SpzOYa1z8yFyR5HkXQWb Db+Eiz2b1soeRJsfGosO1py7RTIJrXKnuXpG8hOlVCxBJx/NgTI44iMEuaiVSboHNR7oKb isM6+CpoRHzhSWnNhKim9vIyyPEa5WQrCmhK64neVxfAJsxnuhOqw5uVOZQQRAFn/KYfUr UqrryojTuBE/rWm62aWI4PPFZmYR/2SkuoUSSmkydmGrX7kqj78NNx90ggopKA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767028034; a=rsa-sha256; cv=none; b=JW6WsI6FeoZBfaW5oZy07q7TqrOASuka7+kE1njoPpHryESBHiz+pD8E+oQTobX8MhoGNb ZFTti4hXKgUQ0fX3u9WwVwlWFbBN42hY7vnN94Wcemc1kuxP5Zp5lOCtAFp9uKmCAuA2G2 JZv0FSS2jPllrxitnGGf/2RMMLrSL+HPCd/5ahMfSuz1nXtH5dVOXK4VcrR9lsmqwduFU0 WP9zqJ17qCqp+jrNEhyMqMQRn2y5efePmXBMAmybVD+EGJ7EZZ+c+m+5YymN0VeKQioMV3 V9bEeNkRYOf0ZTZDOaCq9pQagVb/GqWFgJKaFtvxkm/hWeb2PK6tRXbWGEEiYg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dg2hL4TWZz7jd for ; Mon, 29 Dec 2025 17:07:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 262be by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 29 Dec 2025 17:07:14 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 75293aaeea78 - stable/15 - inotify: Avoid resetting the cookie List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 75293aaeea785b342da41aac811213889ea0512c Auto-Submitted: auto-generated Date: Mon, 29 Dec 2025 17:07:14 +0000 Message-Id: <6952b542.262be.7670f0d2@gitrepo.freebsd.org> The branch stable/15 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=75293aaeea785b342da41aac811213889ea0512c commit 75293aaeea785b342da41aac811213889ea0512c Author: Mark Johnston AuthorDate: 2025-12-21 23:49:26 +0000 Commit: Mark Johnston CommitDate: 2025-12-29 14:31:33 +0000 inotify: Avoid resetting the cookie The IN_MOVED_FROM and _TO events only apply to names in a watched directory, never to a watched directory itself. So, the cookie value there is always zero, and in particular we should not reset the caller-provided cookie value, as it may be used later. Add a regression test. Reported by: arrowd MFC after: 1 week (cherry picked from commit da8ab13249420e85935b89794f333f0755e56385) --- sys/kern/vfs_inotify.c | 7 ++----- tests/sys/kern/inotify_test.c | 31 +++++++++++++++++++++++++++++++ 2 files changed, 33 insertions(+), 5 deletions(-) diff --git a/sys/kern/vfs_inotify.c b/sys/kern/vfs_inotify.c index fd1ef39b13f7..716fdc96e5fb 100644 --- a/sys/kern/vfs_inotify.c +++ b/sys/kern/vfs_inotify.c @@ -723,7 +723,6 @@ vn_inotify(struct vnode *vp, struct vnode *dvp, struct componentname *cnp, } break; case IN_MOVED_FROM: - cookie = 0; selfevent = IN_MOVE_SELF; break; case _IN_ATTRIB_LINKCOUNT: @@ -734,10 +733,8 @@ vn_inotify(struct vnode *vp, struct vnode *dvp, struct componentname *cnp, break; } - if ((selfevent & ~_IN_DIR_EVENTS) != 0) { - inotify_log(vp, NULL, 0, selfevent | isdir, - cookie); - } + if ((selfevent & ~_IN_DIR_EVENTS) != 0) + inotify_log(vp, NULL, 0, selfevent | isdir, 0); } /* diff --git a/tests/sys/kern/inotify_test.c b/tests/sys/kern/inotify_test.c index 713db55afc22..0a4df4e5fcaa 100644 --- a/tests/sys/kern/inotify_test.c +++ b/tests/sys/kern/inotify_test.c @@ -761,6 +761,36 @@ ATF_TC_BODY(inotify_event_move, tc) close_inotify(ifd); } +ATF_TC_WITHOUT_HEAD(inotify_event_move_dir); +ATF_TC_BODY(inotify_event_move_dir, tc) +{ + char dir[PATH_MAX], subdir1[PATH_MAX], subdir2[PATH_MAX]; + uint32_t cookie1, cookie2; + int error, ifd, wd1, wd2; + + ifd = inotify(IN_NONBLOCK); + + wd1 = watch_dir(ifd, IN_MOVE, dir); + snprintf(subdir1, sizeof(subdir1), "%s/subdir", dir); + error = mkdir(subdir1, 0755); + ATF_REQUIRE(error == 0); + wd2 = inotify_add_watch(ifd, subdir1, IN_MOVE); + ATF_REQUIRE(wd2 != -1); + + snprintf(subdir2, sizeof(subdir2), "%s/newsubdir", dir); + error = rename(subdir1, subdir2); + ATF_REQUIRE(error == 0); + + cookie1 = consume_event_cookie(ifd, wd1, IN_MOVED_FROM, IN_ISDIR, + "subdir"); + cookie2 = consume_event_cookie(ifd, wd1, IN_MOVED_TO, IN_ISDIR, + "newsubdir"); + ATF_REQUIRE_MSG(cookie1 == cookie2, + "expected cookie %u, got %u", cookie1, cookie2); + + close_inotify(ifd); +} + ATF_TC_WITHOUT_HEAD(inotify_event_open); ATF_TC_BODY(inotify_event_open, tc) { @@ -858,6 +888,7 @@ ATF_TP_ADD_TCS(tp) ATF_TP_ADD_TC(tp, inotify_event_create); ATF_TP_ADD_TC(tp, inotify_event_delete); ATF_TP_ADD_TC(tp, inotify_event_move); + ATF_TP_ADD_TC(tp, inotify_event_move_dir); ATF_TP_ADD_TC(tp, inotify_event_open); ATF_TP_ADD_TC(tp, inotify_event_unmount); return (atf_no_error());