From nobody Mon Nov 24 17:31:26 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 4dFXtR06qtz6HYWQ for ; Mon, 24 Nov 2025 17:31:27 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dFXtQ0qrmz44wN for ; Mon, 24 Nov 2025 17:31:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764005486; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qmexoPRHXWjAoh4tJXArQ302MK62/gzqKQHRN9MQ5mY=; b=mmsk83UDZgks/NwtT7j2U4mtmb05MQLlxu6DGVhEjRv2tpNbQ6JR7cfkGsTVNbK4DAuUa9 OUGaUW6c2KXdYMmfJepZ6ebtST+XqIe35G3kR3cf0igDE8PdMp8N01zJakIFDiUipMDw6n 4UhfcQ/C8OQA4k+9hjyJB7vBJ+vOznDVKp++TJjSspgb1vlkINoPesiaAhWh6+HfYQ2baK nrGbTSO80qanDfJAckRA5XbblXTiqtY+2LsS3BK2fVFmrACQFSCOiwetrMTHseVpi1xBDZ +fpOogyrGbgUaHlpCLRSwhWZ/ezwe3GwT47REERECe6skRPNZNJlgDTuAlfj4g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764005486; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qmexoPRHXWjAoh4tJXArQ302MK62/gzqKQHRN9MQ5mY=; b=azeviXGlkWoUn9r0Titt3QPpB6sMfMZc88sL5Bfk3LZtlgq5hpj/EqDpvhwkez5uOSeAzC nJ3Wt2ed73htBmluPNavD46PdJXDrXKC4z/NXaHRy6E+z0IO4Wh9fNc4O+6i9M40c4W/QF 7ulvOTZqDsEk/YHu3JH/lpcuXZwLaymZXw6o+Cax0rl6e52RmNv55zZFkL7l+WdCNSe0VU ol3imVd8k2De1X3V2/C8W74MjxaXgvaeZAkimCWHi+c05mpu/nvT4zMo5MSKpElqTp8Yo8 ZbhwbuCpiqxkjIQTX8nCeTmxShtImJuG+wM/Lkm6aZBuyZZt12K6W9w+uRtV5A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1764005486; a=rsa-sha256; cv=none; b=f8bDK1LJnX5Ob9SKATE5S9K1SIyZkEEFVDsENfnN2xMLc7F8IHPkPsWJAC7VOWpQQpFQ/A zX1D9PUSa7SOMTQTgakkdAsQNoI+ZF+Azv3pkizO3eTMCJs53Z9aBeaJtJvF8hMRwPYpK1 FgD/h9DmmXPyv9iezf52s20hflhupl9kRngoQGvkzqLoPgbs64pcjrikx6yML7aDvFItX9 kWnUAoh/4ELD2PJK0Ul3yvJV+1GbWBBX25k3lz/rrUHafqcxvYQJMH6IO8r+TvT2m/mRdM 1gNi4T5cdbJM0RUxC2R121lpXwwj5IoUKTl3E4aypA3UdPMQY9HEwHZ42o+4bA== 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 4dFXtQ0Qdlz7Y7 for ; Mon, 24 Nov 2025 17:31:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3e9a0 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 24 Nov 2025 17:31:26 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Mark Johnston From: Colin Percival Subject: git: 76883b793db8 - releng/15.0 - 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 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/releng/15.0 X-Git-Reftype: branch X-Git-Commit: 76883b793db8385dd98bc81ac993f73eeda6164f Auto-Submitted: auto-generated Date: Mon, 24 Nov 2025 17:31:26 +0000 Message-Id: <6924966e.3e9a0.3ec1daa2@gitrepo.freebsd.org> The branch releng/15.0 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=76883b793db8385dd98bc81ac993f73eeda6164f commit 76883b793db8385dd98bc81ac993f73eeda6164f Author: Mark Johnston AuthorDate: 2025-11-15 18:00:44 +0000 Commit: Colin Percival CommitDate: 2025-11-24 17:31: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"). Approved by: re (cperciva) Reviewed by: olce, kib MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D53774 (cherry picked from commit ebc17879f0885ca87644980f6275b9759b311eb3) (cherry picked from commit 1f6e3abf41718e8e4a309be122f0a6048e9c5772) --- 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 b265a5ff3a62..de8f99ea8d2f 100644 --- a/sys/kern/vfs_inotify.c +++ b/sys/kern/vfs_inotify.c @@ -380,7 +380,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); }