From nobody Wed Aug 5 15:16:48 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 4hFYss039Xz6nQr8 for ; Wed, 05 Aug 2026 15:16:49 +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 4hFYsr4x8Bz3vxk for ; Wed, 05 Aug 2026 15:16:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1785943008; 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=VndAVeTyDeluVPnOnv109fhd2Xvrg/JKddQo5Esal+E=; b=qPtKa1shHAyqpR5zIrRWYetf89J65RgbwHVMdFNIeIhSS4nCoMt5v3nSufYjpB+ODtDaRa aBNrVYzQkZhnhdQW2BGVItC6tFdyddcTHSyL6EI1bf+7mw0zcbYMI9fYlSez5wHEbt/aI6 V6L+Hp72uBV4IlJuObTzn3qNhAWKP57JbX6uwSgpRT599Ch4E4Nqjnb7lnm4ZKL5yp0Alb dXF16nQebjQtwMVHw1wk7PqGhIRPSCXyZZm2QLvvyO9LLm3bdDhNamAY++mNXqAx2sgd3H NPp45G0nTbS6wKT7uRsyPJdjcW69Vn3Yt7WFXzqqb0+zZgTrmZaXCKEY91cmKQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1785943008; a=rsa-sha256; cv=none; b=Ro1zEIR30tCbKB3wzXBgYQHzDFs6/zEj1JR+5jDahDzKa1bZ/ZiuoaSreroVselWbLEhPG rk2Y2mUvRAPJ6Y+tE34rqENpaw91+cXXRlzcz1GyDrvZMjU33+2Iibn4cf38dgJMUt4kCL b7RjLbxy0w1iUrU5rM9iELtNf+MhHULndtHaEUZa+5FOCf56rq+OkKwJZbSQqHbyuCO24G 58tQTNqfoa+v0rC+kqdW8oyZ/h8tgtaZFQ8Vwef3HEHK1oAPgwhHP9ChSgnEfZ6VuREye9 MxmGl0AdhPxc6WaJT6E/nFXxavYh5/3NdevBCZ8yGNDHB5oyq3rWvpP2ZE38fA== 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=1785943008; 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=VndAVeTyDeluVPnOnv109fhd2Xvrg/JKddQo5Esal+E=; b=R1wxdC7RVbWzAHX5XiKxAWGF08hViUGC0LF23htW/tRrsUvsRrsyqhzzaNE9V3pt5h1S1Q atR9ErXcrsvg+mbNcqggfpYwHp9HRZ8yswbr1CI4t6IP/HAr6l3/of4Zht6NWIfOoc9ePM JWtjDHLDKMXCKRSP4St+pDLERwB+glKnwp0/1Sfn8iG5HO6gDMuFzdUWoPOcA9yUNUB32G VZJdZSVbabrJiuTPNO5TmW+e4cDAyQchIyLtiCyP+g7A7nVbW8CxG3ogFTkbVrP4pUywFb LflarJPg+DeyQ7+vb+VTMax4J6gv9JTmvZ3THfV1qetaN09885gzGpjYcb5Q4g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hFYsr3x33zfs8 for ; Wed, 05 Aug 2026 15:16:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 46d94 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 05 Aug 2026 15:16:48 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 6d9339c7b1b6 - stable/14 - inotify: Work around the vput() bug directly 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: 6d9339c7b1b60b97ea1e9391af31b7f4e8de0d00 Auto-Submitted: auto-generated Date: Wed, 05 Aug 2026 15:16:48 +0000 Message-Id: <6a7353e0.46d94.699a2707@gitrepo.freebsd.org> The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=6d9339c7b1b60b97ea1e9391af31b7f4e8de0d00 commit 6d9339c7b1b60b97ea1e9391af31b7f4e8de0d00 Author: Mark Johnston AuthorDate: 2025-11-15 18:00:44 +0000 Commit: Mark Johnston CommitDate: 2026-08-05 15:15:16 +0000 inotify: Work around the vput() bug directly For 15.0, apply a minimal fix which at least ensures that inotify can't trigger the latent race described in commit 99cb3dca4773 ("vnode: Rework vput() to avoid holding the vnode lock after decrementing"). Reviewed by: olce, kib MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D53774 (cherry picked from commit ebc17879f0885ca87644980f6275b9759b311eb3) --- sys/kern/vfs_inotify.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/sys/kern/vfs_inotify.c b/sys/kern/vfs_inotify.c index eba2f0147409..6b82d5e9ab96 100644 --- a/sys/kern/vfs_inotify.c +++ b/sys/kern/vfs_inotify.c @@ -377,7 +377,14 @@ inotify_unlink_watch_locked(struct inotify_softc *sc, struct inotify_watch *watc static void inotify_free_watch(struct inotify_watch *watch) { - vrele(watch->vp); + /* + * Formally, we don't need to lock the vnode here. However, if we + * don't, and vrele() releases the last reference, it's possible the + * vnode will be recycled while a different thread holds the vnode lock. + * Work around this bug by acquiring the lock here. + */ + (void)vn_lock(watch->vp, LK_EXCLUSIVE | LK_RETRY); + vput(watch->vp); free(watch, M_INOTIFY); }