From nobody Sat Jun 13 01:03:49 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 4gcdS630x1z6hSkw for ; Sat, 13 Jun 2026 01:03:50 +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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gcdS54g1xz3lls for ; Sat, 13 Jun 2026 01:03:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1781312629; 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=zzaUqfquWF//pWrdnrwNYRfytUeN92lOKMFOm4nLemk=; b=OiyAyLkSxUg2w1GyIhrUDmO2PPS+unT1uhqaO/m2GXZws1D4n+8BNoHCuxBdqcaNqqqbhB NgzY1jLDXyWCyAViKNHwwvVzVM1vqXVF2DwNa6U2bs+7rLb0f2kT4O23le0Iw3lvjyH2Ve omcuFhvXCphgwke0yZfh5c9Oei88P+BZCdfknOeN2s6WPzfmXqRLas1Zzv2DgM14STMQOk eK7qUVTS1uJmip/n7cX8l/IqkaLBfG80zVHnR8QQVz2iVJXt0DB4pbX4DMw3uvJC12OQJa PEdvNQi5+1cxYB2676pDTE3odhRsPFNIUbDQSgVfrVTTdQbj6NwI8HNrLo8ynQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1781312629; a=rsa-sha256; cv=none; b=q0+ETIwi5ObDaat1jUJJZ+4CoggFVI44AiF6VHFgMB9mNuXAH9GFe3Z7cd/kkl+36s0710 OTYCBA3YO3koBLGrhi9Si5RKKM6Y7UZ6pM8ZqUxTknUs8iTlCfhnRDy9gcrxZoUSaSSZT4 5cAnZYGpHrTxwo/xaoh+1ri711fpNprnJnBPGBkT64iyVl8z6FNSRWtpCq9/DPRTwhJe6A OmIU0XBVpTesf+KMDeJjvwoFgf+OimlJ4vgwi+R2adV6H6jvu+MLRdTq0ihFtlFoibOmqa 36LY29xbJvqxuZE7H2rk+ukUfYTMMZ4SP5BpOwaYqB4nAbqdJTN4xu4rqZqpkw== 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=1781312629; 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=zzaUqfquWF//pWrdnrwNYRfytUeN92lOKMFOm4nLemk=; b=b4GCCe2RiRpzEBpfmEVzP7uR77nO8kfC/I/g3h6E6T35eU3WvKLUUVgsIdFWd1F7BOYlOj MJ7Lh991GdJLyUsl15Sdqy9RTRScsKoBm8gMoCkWokbHgN4QjTTRA32LgOciGuKr3snpKp x4E12BOUI0vfffBONsMXwphzA9UUO5sfOsruYWUtCZMhaz1ZYat/mUwhnAOGrXPPpnQaSH PLZONznAeSBUlZkEtTBsIEw3e2JKaIdlj93uYZQt4a75KX/suiwn0l628FgKpEHKyXBF7i GTrQQRx2mE31urkH1Ch1QWidGpHgFpOAPACXqu7o4H736waZGQn8whSQerNDxw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gcdS549SVz11wt for ; Sat, 13 Jun 2026 01:03:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 20726 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 13 Jun 2026 01:03:49 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: f8fc6a086e55 - stable/15 - rename(2): do not allow to rename root vnode of the mounted filesystem 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: f8fc6a086e559855243ef3d2ffda35e1ae0e7d71 Auto-Submitted: auto-generated Date: Sat, 13 Jun 2026 01:03:49 +0000 Message-Id: <6a2cac75.20726.39e5ef6c@gitrepo.freebsd.org> The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=f8fc6a086e559855243ef3d2ffda35e1ae0e7d71 commit f8fc6a086e559855243ef3d2ffda35e1ae0e7d71 Author: Konstantin Belousov AuthorDate: 2026-06-04 19:56:36 +0000 Commit: Konstantin Belousov CommitDate: 2026-06-13 00:58:34 +0000 rename(2): do not allow to rename root vnode of the mounted filesystem PR: 295826 (cherry picked from commit d53633bfcf24a3eb3711e24b597aa8301f92b958) --- sys/kern/vfs_lookup.c | 2 +- sys/kern/vfs_syscalls.c | 9 +++++++++ sys/sys/vnode.h | 1 + 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/sys/kern/vfs_lookup.c b/sys/kern/vfs_lookup.c index fb3e6a7a2534..addabb45e271 100644 --- a/sys/kern/vfs_lookup.c +++ b/sys/kern/vfs_lookup.c @@ -113,7 +113,7 @@ SDT_PROBE_DEFINE4(vfs, namei, lookup, return, "int", "struct vnode *", "bool", uma_zone_t namei_zone; /* Placeholder vnode for mp traversal. */ -static struct vnode *vp_crossmp; +struct vnode *vp_crossmp; static int crossmp_vop_islocked(struct vop_islocked_args *ap) diff --git a/sys/kern/vfs_syscalls.c b/sys/kern/vfs_syscalls.c index 2516155cc1a3..ef3f7b3e8184 100644 --- a/sys/kern/vfs_syscalls.c +++ b/sys/kern/vfs_syscalls.c @@ -3823,6 +3823,15 @@ again: } tdvp = tond.ni_dvp; tvp = tond.ni_vp; + if (tdvp == vp_crossmp) { + /* + * Rename of the root vnode of the mounted + * filesystem. It is possible to get there with the + * nullfs mount over the regular file. + */ + error = EBUSY; + goto out; + } if (tvp != NULL && (flags & AT_RENAME_NOREPLACE) != 0) { /* * Often filesystems need to relock the vnodes in diff --git a/sys/sys/vnode.h b/sys/sys/vnode.h index bb1d3faf567e..0975b65799d6 100644 --- a/sys/sys/vnode.h +++ b/sys/sys/vnode.h @@ -470,6 +470,7 @@ extern struct mount *rootdevmp; /* "/dev" mount */ extern u_long desiredvnodes; /* number of vnodes desired */ extern struct uma_zone *namei_zone; extern struct vattr va_null; /* predefined null vattr structure */ +extern struct vnode *vp_crossmp; extern u_int vn_lock_pair_pause_max;