From nobody Mon Jul 27 00:26:58 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 4h7fYH3PzHz6mBpW for ; Mon, 27 Jul 2026 00:26:59 +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 4h7fYH04W2z3F02 for ; Mon, 27 Jul 2026 00:26:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1785112019; 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=YVjXx5Inoylw9YD11bDOjXe9iXAxvjeD3dD3jMlcMF4=; b=fSfkRLy1ZDdJjqbNTB5AiQ5Gx0SJWZrE/hnSIHHjpKs0XdbdW2FxpO7/jd+lp8xAvwEAH0 kC/0W9heg6VTBnlF8td2RWcULwknxku2xlXyl5JWGZr3leNKNfnei6A2G/dqqkHg1hASQf 8rStA/TRZ1Pg314MKXJavr56EzvQHGvNh8m6RsU0tt1Qv1G0bBAxss2105QWXEARa/0NnJ pt6bO5TzJtPqtQ3NAPLrSUGR/W0NaNsYaXl0Job+DUv6A3s2G7oMkk+Hqm4f/87109/Xs9 4tLY3TDNMLh+pwZ8WT2u4V5BHHxN/EMt0+U1qeb/4MT9eQQ+OJAR5T4ycTbI6A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1785112019; a=rsa-sha256; cv=none; b=PyZQ05nASf5RJjbJ43FkcZwyb3BjZdULog0DZ0ORQpBKkyn3tscnfU3Egdhwl0xQuHC081 KMh2vm6SMyQ6WI1PKJuZh+mIszzWfLhynuObOltCCIlMRir/49vbNZ7cOxnHBdHCjuBgNl yOHJEjH6CeAUko0dU1p5glhpyWIvWWBVQLbDn+rvXmsd9p25WM1BiqiyedbjWDeSBo/ehY 8ZLm+2NTceIx3O98bUPsT6mw+O9EP0kqqXOya1udyh0Ean+ADOOvbOarQiyo9w8g5iJRFB LzIZlKNsMYMpz2KwdkeXfo2UOlX3V9dNiqGiTD/SxdCYjgPDipOzB+6f++cJ+A== 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=1785112019; 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=YVjXx5Inoylw9YD11bDOjXe9iXAxvjeD3dD3jMlcMF4=; b=JP4siwzEXtccX7EwE5WznUrVaoqDlZN2oG6HT0WD4NonNdniqleBbK9lWCxpZCnlalPvgt jBcBTj5PQWljSOj0LvWRYFQH5+sWDGVvjRhYWftlc7VM8D4YWXgltd2SZ1ycJtG/PTg/cK 7/IsrjogdhdXpGvnIOnjuRBxegKzbBBRbCmP83DTdzBAccmS0g3ZMmiNdB9QMb/FyCtzs0 Vzhuj2M3HyXMySKdcdt+kRBjs8hKFWWBImXjDvO1+0c0wPdTaebaDHpkF8kEAm7AvUx7Br p/Ja3Lm8uOaZAD12kuQAZ5tah23qNSG7Hg0kV9kapu8/eE3RYb364UHjqX07Dg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4h7fYG5dvxzm2q for ; Mon, 27 Jul 2026 00:26:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 25fde by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 27 Jul 2026 00:26:58 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 02b4a95522c9 - stable/15 - lookup: do not return vp_crossmp as dvp for mount over the reg file 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: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 02b4a95522c9028a47dbe3571563cda72e115875 Auto-Submitted: auto-generated Date: Mon, 27 Jul 2026 00:26:58 +0000 Message-Id: <6a66a5d2.25fde.773837f4@gitrepo.freebsd.org> The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=02b4a95522c9028a47dbe3571563cda72e115875 commit 02b4a95522c9028a47dbe3571563cda72e115875 Author: Konstantin Belousov AuthorDate: 2026-07-12 11:56:13 +0000 Commit: Konstantin Belousov CommitDate: 2026-07-27 00:26:15 +0000 lookup: do not return vp_crossmp as dvp for mount over the reg file (cherry picked from commit 29d1a3248a6da1ed9f1a46d7d525fb779306a90f) --- 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 addabb45e271..8d1d9cfff8aa 100644 --- a/sys/kern/vfs_lookup.c +++ b/sys/kern/vfs_lookup.c @@ -1483,15 +1483,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 769ebbcd18dc..a6f513b719ba 100644 --- a/sys/kern/vfs_syscalls.c +++ b/sys/kern/vfs_syscalls.c @@ -3821,6 +3821,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); @@ -3842,7 +3849,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