From nobody Mon Jul 20 21:55:46 2026 X-Original-To: dev-commits-src-main@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 4h3vTg3vsqz6dVmQ for ; Mon, 20 Jul 2026 21:55:51 +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 4h3vTg3Q5yz3HJP for ; Mon, 20 Jul 2026 21:55:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1784584551; 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=wnOD3rtuWowCPGp/IBgSoYUU5xCm0BtcIGve7ZrOu1Q=; b=UnkaEE4bGQFo6JNGb4IJQUUHNDzWRrP1M1ZEFxSNueK5s1HIXGTFIfMdzFmPh4qAUmImHm KYDIvQ4S2zFV9/2esNOIq+zbHuDmNMesrCe+h1FTzgj7gfpXaitEx8sUC21XnZslY0Mijw 5pZkI6eeUuH3laINsNgWaorZPgd8FF8gcyi++1Qs5GB5DKXFGnk1BXIJHPjntRlZOWVfOn e6hrcXEiR2XibGWGtbs/0FkOi9g9pmm1ET7/q3hFUtrfRXywUPrp0k/H37gcdrvLsCI49k usuGtjMcHtdRq2jNsRhB4HShZAIrSHe7rGurSpys3I8FVDV/uLBJh3qrFBhSoQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1784584551; a=rsa-sha256; cv=none; b=B2jopkQwCTQkFb9LSSfZmgsVZCOeT2d9y1BP5FGxmLk0WJnV7h/KsxAK9I5Xkki2zUangH gfiuNi8N9KFeceSU0+KpmFPXle+C8HlKNPSuMus/gtxjDos3c8pb8bCo9HP7ZfACTt1+67 GFuBN0+GxAfu5qvIa98esCnYrpI1ElPjxiZC7wgRSHTDRRpnC8Q+ARuLdRiQpKx8jEJbg9 uBW0170oGJxgZ71X3bAqRPnWyA6bBpCgLtVpbiSY6KIH86f2XTKC2N3Ad51awahhRFbO97 /89eMiFf9E/0CSZ5Q0f5hbSSMlY35gb0rerXUSwCir5O8egLX8h8TDnKeQ0E9Q== 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=1784584551; 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=wnOD3rtuWowCPGp/IBgSoYUU5xCm0BtcIGve7ZrOu1Q=; b=u9wVUDEHKsopkRJ07oc5TKhLUXc+eRnq08JFlseTVhcEB+Lx9bWpGOgPHe9ffD/daSP1NP evxUwwJiczRCG9HO8mapnexSZkI2WLquRAw2r3PiI6iMGSI2FSrjKL2/fblc81UKv8SHon 9UDeoJiIJpJ69Eg3SdU3on+Huwa3AL3yRvf3nSXi2ftUkOUowYICPja0XRQVfOh7MECRzo Axf6hEMRepxW6m9EHx1TA1reKnuxhUhLLCwZKYBAsjTrRQgrg0ebLcR2Ctn9SXqe3qMthp OacoFrBfla/kkvQW3vQr/59fO932KU8oRybasIsHXVBGJ8yGYhbF1ge595GvrA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4h3vTg2JPrz4w1 for ; Mon, 20 Jul 2026 21:55:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 24375 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 20 Jul 2026 21:55:46 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 29d1a3248a6d - main - lookup: do not return vp_crossmp as dvp for mount over the reg file List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 29d1a3248a6da1ed9f1a46d7d525fb779306a90f Auto-Submitted: auto-generated Date: Mon, 20 Jul 2026 21:55:46 +0000 Message-Id: <6a5e9962.24375.7eb6d7a0@gitrepo.freebsd.org> The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=29d1a3248a6da1ed9f1a46d7d525fb779306a90f commit 29d1a3248a6da1ed9f1a46d7d525fb779306a90f Author: Konstantin Belousov AuthorDate: 2026-07-12 11:56:13 +0000 Commit: Konstantin Belousov CommitDate: 2026-07-20 21:55:39 +0000 lookup: do not return vp_crossmp as dvp for mount over the reg file Return the covered vnode instead. Tested by: pho Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D58191 --- sys/kern/vfs_lookup.c | 34 ++++++++++++++++++++++++++++++---- sys/kern/vfs_syscalls.c | 9 ++++++++- 2 files changed, 38 insertions(+), 5 deletions(-) diff --git a/sys/kern/vfs_lookup.c b/sys/kern/vfs_lookup.c index 5d66070ca142..57b536eab6ea 100644 --- a/sys/kern/vfs_lookup.c +++ b/sys/kern/vfs_lookup.c @@ -1487,15 +1487,41 @@ nextname: error = EROFS; goto bad2; } - if (!wantparent) { + if (wantparent) { + /* + * Do not return vp_crossmp for the case of mount + * over the regular file. Substitute ni_dvp with the + * covered vnode. + */ + if (ndp->ni_dvp == vp_crossmp && + (dp->v_vflag & VV_ROOT) != 0 && dp->v_type != VDIR) { + struct vnode *mvp; + + vput(ndp->ni_dvp); + mvp = dp->v_mount->mnt_vnodecovered; + vref(mvp); + ndp->ni_dvp = mvp; + if ((cnp->cn_flags & LOCKPARENT) != 0) { + vn_lock_pair(dp, true, VOP_ISLOCKED(dp), mvp, + false, LK_EXCLUSIVE); + if (VN_IS_DOOMED(dp) || VN_IS_DOOMED(mvp)) { + error = ENOENT; + goto bad2; + } + } else { + ni_dvp_unlocked = 1; + } + } else if ((cnp->cn_flags & LOCKPARENT) == 0 && + ndp->ni_dvp != dp) { + VOP_UNLOCK(ndp->ni_dvp); + ni_dvp_unlocked = 1; + } + } else { ni_dvp_unlocked = 2; if (ndp->ni_dvp != dp) vput(ndp->ni_dvp); else vrele(ndp->ni_dvp); - } else if ((cnp->cn_flags & LOCKPARENT) == 0 && ndp->ni_dvp != dp) { - VOP_UNLOCK(ndp->ni_dvp); - ni_dvp_unlocked = 1; } if (cnp->cn_flags & AUDITVNODE1) diff --git a/sys/kern/vfs_syscalls.c b/sys/kern/vfs_syscalls.c index 29d503bbb3fa..eeee67418877 100644 --- a/sys/kern/vfs_syscalls.c +++ b/sys/kern/vfs_syscalls.c @@ -3819,6 +3819,13 @@ again: } #endif fvp = fromnd.ni_vp; + if (fromnd.ni_dvp->v_type != VDIR) { + NDFREE_PNBUF(&fromnd); + vrele(fromnd.ni_dvp); + if (fvp != NULL) + vrele(fromnd.ni_vp); + return (EBUSY); + } if (exchange && fvp == NULL) { NDFREE_PNBUF(&fromnd); vrele(fromnd.ni_dvp); @@ -3840,7 +3847,7 @@ again: } tdvp = tond.ni_dvp; tvp = tond.ni_vp; - if (tdvp == vp_crossmp) { + if (tdvp->v_type != VDIR) { /* * Rename of the root vnode of the mounted * filesystem. It is possible to get there with the