From nobody Wed Aug 5 15:16:43 2026 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 4hFYsl5syCz6nQlN for ; Wed, 05 Aug 2026 15:16:43 +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 4hFYsl1xLjz3w3Q for ; Wed, 05 Aug 2026 15:16:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1785943003; 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=I/mM+QszY2ztrGTsaQmIRoD3br0JROhBjGKj3tXML+E=; b=ny7Qu0pYE56390czQYl1pfFW1btInjfw6TalTOVSDoXSWe/4B4ZXg18oOxqNM/A9+m3sYv FKiqrGxXYDUzFYlQNUvm6lVnsHO9qWPi6R88112p8l/ZKEOmyZ9zEnBtz7lnqkZBkpzi/j QCAado8jD5OTka5rfavdSSfwO6OxZbYkg2rUGwHQUJyLZsxL0qT0luKgb5DwXK5FNM11ON aHp8tJxcRR8EIWyAd++0ivZxoTQj/FQ1mOkPgA+Geebn1Yg/8trTIAuzaC9ycDR5CNdQBu ih6W4nNghjWWWqRQhh0xNG1o3uu1Mj9pC/cpVPgdMX7RI7Bg7OjoGVsogXh6iw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1785943003; a=rsa-sha256; cv=none; b=U/pyVwa2y6RAiVCRyJATFr72lXvcgXGlUrDo9A8L+gh+81655D54YD702jyH+JS6ITGEir en2dX6HxvjpPiT2JvRPzFe3lvbxld8Vy4w4aHiHcSGD322eKohwEdeh7MBeC1t5HgLjNbf oDYfp7Zc/h7LazCPxG+3+rNEuo9EB3oVtZLI/7NY7KDmRlOnil6VHKLOcUPJdS5IitsW1W Mj0OQ9OopWoTI24lP0LUQK6xu5vmH648q/0tG/c100LWiuS0wXI6N5wwYIXXctemccYbTk kz1f4sDXOAbmv/M9SCGAhheHRNcW1CnKCZ98ACEntQce7Pel+pF5zWI0rn/NcQ== 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=1785943003; 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=I/mM+QszY2ztrGTsaQmIRoD3br0JROhBjGKj3tXML+E=; b=YXmHx67WxJdih8ic73w3ywOzJXpo3srDIY+jdazN1rCJjwzMVnx7NDolfZQjOlzcinKGj3 BVKklsHdgodQGPsu6x1UMaRArBAZQ/9MljVqJejDsewbedqCG7T0dRa8cZNHPuPsJPac83 7b9yQjMsw9Lv41VmEbKhRd9RqiTE++rvOx8mYVlJrZFRoe2bIgc5J+mCdtJ/Yjs+uYVPbG Pls5QhrZFCEfTn6O9IX10HejwSOs0V0MicfbjiBLj/xyVjzLxn+75rPToRz/NMIxH4etlg k6MhiNVzhOS/jW/g7Nlm3C5YcgXSqiFypLQmNHYJOQnfX+SrSV2cYqXCcZb6bQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hFYsl0jFrzfWD for ; Wed, 05 Aug 2026 15:16:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 4602b by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 05 Aug 2026 15:16:43 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 9f2c32c1924b - stable/14 - inotify: Fix a couple of locking bugs 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 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: 9f2c32c1924b524f9e353bee74884d263b273a4f Auto-Submitted: auto-generated Date: Wed, 05 Aug 2026 15:16:43 +0000 Message-Id: <6a7353db.4602b.33587ee2@gitrepo.freebsd.org> The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=9f2c32c1924b524f9e353bee74884d263b273a4f commit 9f2c32c1924b524f9e353bee74884d263b273a4f Author: Mark Johnston AuthorDate: 2025-07-18 14:25:28 +0000 Commit: Mark Johnston CommitDate: 2026-08-05 15:15:16 +0000 inotify: Fix a couple of locking bugs When hooking vop_rename_post(), the preexisting dst vnode will be unlocked. But, we need to invoke VOP_GETATTR on it in vn_inotify() to check its link count. In inotify_unlink_watch_locked(), the vnode interlock is not held, so don't use vn_irflag_unset_locked(). Reviewed by: kib Fixes: f1f230439fa4 ("vfs: Initial revision of inotify") Sponsored by: Klara, Inc. Differential Revision: https://reviews.freebsd.org/D51401 (cherry picked from commit af0ec3fa29cad823d0196538381f1e832f5974a7) --- sys/kern/vfs_inotify.c | 5 +++-- sys/sys/inotify.h | 14 +++++++++++--- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/sys/kern/vfs_inotify.c b/sys/kern/vfs_inotify.c index 46971c78440c..035c2c9eb290 100644 --- a/sys/kern/vfs_inotify.c +++ b/sys/kern/vfs_inotify.c @@ -368,7 +368,7 @@ inotify_unlink_watch_locked(struct inotify_softc *sc, struct inotify_watch *watc TAILQ_REMOVE(&vp->v_pollinfo->vpi_inotify, watch, vlink); if (TAILQ_EMPTY(&vp->v_pollinfo->vpi_inotify)) - vn_irflag_unset_locked(vp, VIRF_INOTIFY); + vn_irflag_unset(vp, VIRF_INOTIFY); } /* @@ -672,7 +672,8 @@ vn_inotify(struct vnode *vp, struct vnode *dvp, struct componentname *cnp, struct vattr va; int error; - error = VOP_GETATTR(vp, &va, cnp->cn_cred); + error = VOP_GETATTR(vp, &va, + cnp->cn_cred); if (error == 0 && va.va_nlink != 0) selfevent = 0; } diff --git a/sys/sys/inotify.h b/sys/sys/inotify.h index 65dc5dba43f3..d1f23d5898bb 100644 --- a/sys/sys/inotify.h +++ b/sys/sys/inotify.h @@ -107,11 +107,18 @@ void vn_inotify_revoke(struct vnode *); } while (0) /* Log an inotify event using a specific name for the vnode. */ -#define INOTIFY_NAME(vp, dvp, cnp, ev) do { \ +#define INOTIFY_NAME_LOCK(vp, dvp, cnp, ev, lock) do { \ if (__predict_false((vn_irflag_read(vp) & VIRF_INOTIFY) != 0 || \ - (vn_irflag_read(dvp) & VIRF_INOTIFY) != 0)) \ + (vn_irflag_read(dvp) & VIRF_INOTIFY) != 0)) { \ + if (lock) \ + vn_lock((vp), LK_SHARED | LK_RETRY); \ VOP_INOTIFY((vp), (dvp), (cnp), (ev), 0); \ + if (lock) \ + VOP_UNLOCK(vp); \ + } \ } while (0) +#define INOTIFY_NAME(vp, dvp, cnp, ev) \ + INOTIFY_NAME_LOCK((vp), (dvp), (cnp), (ev), false) extern __uint32_t inotify_rename_cookie; @@ -126,7 +133,8 @@ extern __uint32_t inotify_rename_cookie; VOP_INOTIFY((vp), (tdvp), (tcnp), IN_MOVED_TO, cookie); \ } \ if ((tvp) != NULL) \ - INOTIFY_NAME((tvp), (tdvp), (tcnp), _IN_MOVE_DELETE); \ + INOTIFY_NAME_LOCK((tvp), (tdvp), (tcnp), \ + _IN_MOVE_DELETE, true); \ } while (0) #define INOTIFY_REVOKE(vp) do { \