From nobody Tue Mar 31 15:58:59 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 4flXqC0rkrz6WFG0 for ; Tue, 31 Mar 2026 15:59:03 +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" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4flXq84LcDz3gnp for ; Tue, 31 Mar 2026 15:58:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1774972740; 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=d6z/K7dXL0RW1nYxahS4ukWt37hWn9w1ekzs7QHl2rc=; b=DVjfte9w6/b4f4yFU7lDuKvWBcSTAnf+urkYW9ZusWJ0xsZfjsPlSGwL9e41PEKAGOWe+X ibfloMzpIfkbjYXQToMb2lise5Jp+froztnLdhNjmt7nnDHSQkOlSrA5M6/MreWvGKYIxk m2vFa+7mt5d7lZq+DirRFrt0N2QnWh1TZl87Vv5wS4V4ZGP12miFVf5iyuDqhD+FVL2XLh vwpRs/pL1KMKYDk5AqrUEuruj9pw2Ul8mMYeBnZJQSwGDaQ5mNO6nZmEJTYfEwrsSZePL/ Mr5iKH3rBdcR4/nJvTzS9sB6/co0qDiRD0VUnGK8zC+YVUr8OR7h/LaymSb/AA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1774972740; a=rsa-sha256; cv=none; b=SC3zZytx9OOMtuTTG5QSHE8pi0M/DROY3gSfpL2ZWIW6dk0nNUXUixPYUBv045Jnd/UwAE +7CKvWPFtLRPFEeG9Vho4Kr8ZAxDPRiZ9kGxacvPP3+XRulILk6QNV3BzlDgvSjkXhlE6t JQD+H79PEGViQYU6wemQay49ViLRP64SDKXe1cGaBFupviMbCxSqvkp72CTpzI1ugwTBv3 UaUXBcXQqu1YEslxn/OkHlDIBmNIgLzi50sw9xDa/DSUWvT4XdZFMcvYJpKv/T5ipcugCH hv1Z7oVJND+m/bN8h4Ng6YeglpIrleYX0e7CneoHqnawx7TqLAxhWcpfMHHXbw== 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=1774972740; 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=d6z/K7dXL0RW1nYxahS4ukWt37hWn9w1ekzs7QHl2rc=; b=aeAxzkBr+DBwHfyEG37SQl6S6rLtO4dwjdVmqIATx/POcLvL1oHR92zZtbvEOMD2jqqz5x Jbij8lIexJaGIG/C3V151XegSuyGyWSqU0AnvzVmz1+on4DRIyZtRJ06wz/8DCSO1D65R9 8iJLzPCKypPs8oNj5WCRTLHFIq3vtb9scrANT3nWUj2b9E3zmXQlXTZKR8xiokdsrK6G6x UFPyaDKTxG5SZYT9cmuqYFcySHcV5XX9kPokhOarVZrRdAy74hsRFWB3MDC8EG4BhawtPg 1rDr1XUch4DqtiWxwn7xH1dyahEIUg0pD0AumGrNbqhHA8L3gEP8ywbcEnyg9Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4flXq703c5zcHY for ; Tue, 31 Mar 2026 15:58:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3a0c1 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 31 Mar 2026 15:58:59 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: d86a85e9b5ec - stable/15 - nullfs: Fix handling of doomed vnodes in nullfs_unlink_lowervp() 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/stable/15 X-Git-Reftype: branch X-Git-Commit: d86a85e9b5ecc59754616edcd915e7d9eae9bab1 Auto-Submitted: auto-generated Date: Tue, 31 Mar 2026 15:58:59 +0000 Message-Id: <69cbef43.3a0c1.41d1bf93@gitrepo.freebsd.org> The branch stable/15 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=d86a85e9b5ecc59754616edcd915e7d9eae9bab1 commit d86a85e9b5ecc59754616edcd915e7d9eae9bab1 Author: Mark Johnston AuthorDate: 2026-02-25 15:31:30 +0000 Commit: Mark Johnston CommitDate: 2026-03-31 15:57:29 +0000 nullfs: Fix handling of doomed vnodes in nullfs_unlink_lowervp() nullfs_unlink_lowervp() is called with the lower vnode locked, so the nullfs vnode is locked too. The following can occur: 1. the vunref() call decrements the usecount 2->1, 2. a different thread calls vrele() on the vnode, decrements the usecount 0->1, then blocks on the vnode lock, 3. the first thread tests vp->v_usecount == 0 and observes that it is true, 4. the first thread incorrectly unlocks the lower vnode. Fix this by testing VN_IS_DOOMED directly. Since nullfs_unlink_lowervp() holds the vnode lock, the value of the VIRF_DOOMED flag is stable. Thanks to leres@ for patiently helping to track this down. PR: 288345 MFC after: 1 week Reviewed by: kib Differential Revision: https://reviews.freebsd.org/D55446 (cherry picked from commit 8b64d46fab87af3ae062901312187f3a04ad2d67) --- sys/fs/nullfs/null_vfsops.c | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/sys/fs/nullfs/null_vfsops.c b/sys/fs/nullfs/null_vfsops.c index 170a3dd51cd8..c3eec727aeea 100644 --- a/sys/fs/nullfs/null_vfsops.c +++ b/sys/fs/nullfs/null_vfsops.c @@ -461,16 +461,12 @@ nullfs_unlink_lowervp(struct mount *mp, struct vnode *lowervp) vhold(vp); vunref(vp); - if (vp->v_usecount == 0) { + if (VN_IS_DOOMED(vp)) { /* - * If vunref() dropped the last use reference on the - * nullfs vnode, it must be reclaimed, and its lock - * was split from the lower vnode lock. Need to do - * extra unlock before allowing the final vdrop() to - * free the vnode. + * If the vnode is doomed, its lock was split from the lower + * vnode lock. Therefore we need to do an extra unlock before + * allowing the final vdrop() to free the vnode. */ - KASSERT(VN_IS_DOOMED(vp), - ("not reclaimed nullfs vnode %p", vp)); VOP_UNLOCK(vp); } else { /* @@ -480,8 +476,6 @@ nullfs_unlink_lowervp(struct mount *mp, struct vnode *lowervp) * relevant for future reclamations. */ ASSERT_VOP_ELOCKED(vp, "unlink_lowervp"); - KASSERT(!VN_IS_DOOMED(vp), - ("reclaimed nullfs vnode %p", vp)); xp->null_flags &= ~NULLV_NOUNLOCK; } vdrop(vp);