From nobody Wed Aug 5 15:16:49 2026 X-Original-To: dev-commits-src-branches@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 4hFYst2dMBz6nQjb for ; Wed, 05 Aug 2026 15:16:50 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4hFYss5h7Vz3wCV for ; Wed, 05 Aug 2026 15:16:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1785943009; 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=dNR22FS5vKgM3XBW6EyTRR0h+X2l7d9XnY+t5B/sEpM=; b=Xf0v3toayTnY8ffXtNKRiQZgvMtqsvEbeoCLruqdVGLmrnP/CyM4z6heGccH0qaDZiSf0x wxBBnMz0DcNLoU8SwmgrdwZX4PLjolH42agPU9M1za3NUFTaxLyezir4et/ryTWHsKiMzv a+qrnQF+dsmK8XmJbc7d/Lhllta2GKKLTMn2WU4Nli2h+KE10YW03LwTq0g0yXgvl9QWNY KwPc9oIle8x33HYKv2r5AjyYN3Y806f6MkDG36odwwSZ7R4iKpHlT/LhSKMV0AjPJwPnrB OTQy9T9mr7csvqFz5YAafJEneDYM442Ne99e85SR463djF+xKljiFJWBxV3aRw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1785943009; a=rsa-sha256; cv=none; b=HclIjCXhcQTHxV+eNuia7L1ee550DfUQOfOifGU5BAjXohWcY6xVtOXPlgxHP7oFFcd57F GgKDafYJ5SBe8ZW5rkas+PpMKygseRJoehQ3VIGPiJ6vfkxMfWUVHFXTDAe1u91kasHN63 mjmXAT3vmjslezTCmN4chUDvIXolMOvB1VuLHjp89s8e0kcfqUvNNFJNWRento/QZGiYIl ekgL1AOIHajGDCqZxXL0ePwCZef5JwVqN9rVyi0EOIHJhKlxmkto/9IQmb0hcQVwdJCPUN 7KNz0AgXmCPPd7JpDXszwWLJdFZf8IPY17IdFjOO/U1SvYAQXjNQOBI2pMQBqA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1785943009; 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=dNR22FS5vKgM3XBW6EyTRR0h+X2l7d9XnY+t5B/sEpM=; b=pqFBmTJI8ddsH/ZJpdZE6eBQPY85I3MuKwsodwse/kLPaL5dkJm/EMhc3zNdPPt9TZCDOf mSGEBzr3Vo096H0ckR4JFPcnyvV/HggghuTNlHniXCtbpM698ozML5Ik+Y7Xh4rcpkurXK pBSw35xgY1D1kMtb2Cqe0mXyXPgOOlWCrQOVMjSBa9XFzclxLGa+WFxHwI/cUQWRRdPWlJ XDgtxCQ1zGsBKUyMQcjAOWHVwmeMNuVTPCoQz/KWNJWsVyxeRu0l7YACrxu8pYCRnWS3Kr Jx1LEToXojqj1JCM4zjtEVdh/XYVJAsFKpmxONkO1N721mJNsg1VVvi9K3KRnQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hFYss4Y98zfgF for ; Wed, 05 Aug 2026 15:16:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 45e3a by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 05 Aug 2026 15:16:49 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 84235bcd4bde - stable/14 - inotify: Avoid resetting the cookie List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list 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/14 X-Git-Reftype: branch X-Git-Commit: 84235bcd4bde587c134820763c2880fd8e653717 Auto-Submitted: auto-generated Date: Wed, 05 Aug 2026 15:16:49 +0000 Message-Id: <6a7353e1.45e3a.297c5958@gitrepo.freebsd.org> The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=84235bcd4bde587c134820763c2880fd8e653717 commit 84235bcd4bde587c134820763c2880fd8e653717 Author: Mark Johnston AuthorDate: 2025-12-21 23:49:26 +0000 Commit: Mark Johnston CommitDate: 2026-08-05 15:15:16 +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 6b82d5e9ab96..e003759348a3 100644 --- a/sys/kern/vfs_inotify.c +++ b/sys/kern/vfs_inotify.c @@ -719,7 +719,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: @@ -730,10 +729,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 968c0f83fc8b..b4fa21862063 100644 --- a/tests/sys/kern/inotify_test.c +++ b/tests/sys/kern/inotify_test.c @@ -908,6 +908,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) { @@ -1007,6 +1037,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());