From nobody Mon Dec 22 14:47:37 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 4dZgwV0652z6LH2G for ; Mon, 22 Dec 2025 14:47:38 +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 4dZgwT5gxMz3SRJ for ; Mon, 22 Dec 2025 14:47:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766414857; 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=bOG5YYtELlB4iC9gmM9Eyjrko6X5EG7UlnUWqLphiKw=; b=Q1gOa3MJ3C1QBiLAXX4Wl4OrHu+tcNjnJtlA5OZRxqPPXmTl4nq9s3AFKrIfBQsV+Wz2hC Za6CXpYpxpFrcu7hsx4d+Vvp8vU90uMGKK6cTs6KWRsuF8Gz6oWZe9IfscHKhDGD5QsYbv KdEhd+4RA3cl8t58GViVEhsm+roBLDTIGKe9f6k82PLLXP/URjaynzJ7xWJxN1ETvv1twI OUJqVT/sTAIJ6mc25AwDbMYdNNod+d83qvYfzH7oplhfNeiKHJJfWDnJMm9nn6GFnD+UgD fVvfmq13yycmai1bAutIvj+Fc0t3ipBawTFkoIk1OqmpD3Oeqrmw91rZA91mug== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766414857; 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=bOG5YYtELlB4iC9gmM9Eyjrko6X5EG7UlnUWqLphiKw=; b=Ssf8qKoOsGIRJ0mpBPYv7DmTh1NZ9xSPScgxg53XXEZQ7E/K+a35XcuWIgWlJy6YWOcx7f 9bl0IjOf2wOX9dYgi6iC97OCGctP6boN531wHluI2/GrCqMdNmTsPVX7/08FR7AtcYeDqD iIOt4a9eHz/+uXVTYBqRNJPqgNUgrR5Zdy/suA7qVj9OxMQJxNJyPuXWfOBf5O3QX+4RsO hSGJimKIV3kkNiCjVABy1KPCLTsiwb58znUZ9HIyPKydJeFJ9L/Vewg7cVJ1sl5G+gMt34 U6JDsl6p8+yt1iKs+y1+she/4+fs+TuGxDUCqn+U2j6QgtTdd0Bc5p9UHV1Ojw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1766414857; a=rsa-sha256; cv=none; b=wRND/AaBLlzSPkLFcpHlUXJIn9BvI5/2ohjdq0V+MYn9LaLXKDTKxt4bl7HaOmjJX/TiyY 5DdL4bwCTT8lD91sMssvuB5aZIUgjXUZX5RdnLQswytoWL5cBTUoP4YO+9CyXPCCL9Oo/5 Mq2NEufPGBXWKclAlvyVWcOpgrqRt+hkwfHXFyJvCgl8V8Ugho2kCflLBHF0VMV0Yx2SiS kFSLJDJvPPvcc3igulTqWOXHOOwPyrZAtdtCFszlCCtYQyE+k/K2T62xfNFcfhLZOhxEgd /ZG6eDz7U9+O6aruM53qP4Qoq884qEvjRWr6Ryhm5C7yygCTJ067RFIl9DAZyw== 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 4dZgwT573jzVpT for ; Mon, 22 Dec 2025 14:47:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3f5b9 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 22 Dec 2025 14:47:37 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: da8ab1324942 - main - 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/main X-Git-Reftype: branch X-Git-Commit: da8ab13249420e85935b89794f333f0755e56385 Auto-Submitted: auto-generated Date: Mon, 22 Dec 2025 14:47:37 +0000 Message-Id: <69495a09.3f5b9.24b4d6d@gitrepo.freebsd.org> The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=da8ab13249420e85935b89794f333f0755e56385 commit da8ab13249420e85935b89794f333f0755e56385 Author: Mark Johnston AuthorDate: 2025-12-21 23:49:26 +0000 Commit: Mark Johnston CommitDate: 2025-12-22 14:47:27 +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 --- 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());