From nobody Fri Dec 19 18:06:09 2025 X-Original-To: dev-commits-src-branches@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 4dXwT24vvqz6M9Fl for ; Fri, 19 Dec 2025 18:06:14 +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 4dXwT22X3yz44cj for ; Fri, 19 Dec 2025 18:06:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766167574; 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=2+refv5Bqty6GphUVo0rvzc4jhdvxEvjRiamNkg1IgU=; b=H4IkouYcemvY4MESZAu8ua82JdUhhSOg/0bSb57Bhu/dMOW6X+fUmyqC8nbbJGzSXurb1A N5mEJ80XolOSnsYD/RhCx+t3+IpMh3yvz+YqY3f0DzDe+jOBVuP6HRhOSq5F5y4j+puxIN uwnXx3YLQX7PI3oB602i/MLLDCMHTe2mK4ixYbnCP4leiNMb6Wa2x//l+zxjB1MoFLQ8pC R7L/m9806oAQ+c8wW059LexfSOVoIJt4zsUbfJyrk/2iOQAid/jCw1x5Wm8QixeIqf+qBf 6CJOqewa/mPjWSewXZngIePbQ3n/kmSaT4MKRNCI3kUJgIcx51Bd1u1OOhHiWQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766167574; 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=2+refv5Bqty6GphUVo0rvzc4jhdvxEvjRiamNkg1IgU=; b=cq2yGdYmFXPbml03YQz5/XLcXBfCT8nGoVgeZWH6diZv8xBgVOp9nSKvCIUajlk/fkegJJ r+fDRch4+vNf8uaoKVq9oSsul1iXBUh/ZB+3KOfFu81Z49YVHLHs2V3Ko0CGRgtHovNf+P YHzabnrS87cvrRQHIbIGukF+tDjEza9Y4WnFZq0CFLeICwXpghEnozxECiUTPotazt7wof X04reilDnv4HHj8ki24qS7ubgrA8BFXoVAYRvI+Ci8LEMwaPDZIBiCH5K9q/isQqIStUmE Idpax2bIFVStvpAUfNaTwqPjJ+9sHuRKudIiSEt/U89FGN6HPZ8nsTDcYcpiGA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1766167574; a=rsa-sha256; cv=none; b=SPwvaOjdnIoBK/wr/lwGWJry1p2sz/fPHbmax1LLivUsEARv0oPTTmJ9BwvHE1o8F5TV8E jg1eEutZVp0Kx9qDe3rDmokiei4nrDsfhQg4Pe1K9BzEEJvZbcN30zgpJUa1E5Kj+oZu1o Xe4H/ngi+TRZYpH/LaH/Ff1Ii/5lcFzDc0YFHjjhvp49Gkkz3IhFYq0fGkZFjGuO5Hw70K 0LhFosIsfJg5nz7a4UxTAM2RTFsvJNHGHuDe71cVbbh24WC4ZibjWJii9SSm6EuaWDCLnH jWaygVHGLsn3p0/cCehKqfUhZlOA0uWxSe4+n685nahaQD+pmMxcPaxUZ5wtUw== 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 4dXwT21mY8z4GL for ; Fri, 19 Dec 2025 18:06:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 20874 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 19 Dec 2025 18:06:09 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav Subject: git: 90e09bfe799d - stable/14 - vfs: Let prison_enforce_statfs zero the fsid List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 90e09bfe799dc96e7e6e0071a053852cad152d96 Auto-Submitted: auto-generated Date: Fri, 19 Dec 2025 18:06:09 +0000 Message-Id: <69459411.20874.59e1b121@gitrepo.freebsd.org> The branch stable/14 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=90e09bfe799dc96e7e6e0071a053852cad152d96 commit 90e09bfe799dc96e7e6e0071a053852cad152d96 Author: Dag-Erling Smørgrav AuthorDate: 2025-12-14 13:16:16 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2025-12-19 18:06:00 +0000 vfs: Let prison_enforce_statfs zero the fsid Currently, we unconditionally zero the fsid before returning a struct statfs to a jailed process. Move this into prison_enforce_statfs() so it only happens if enforce_statfs is greater than 1, or enforce_statfs is 1 but the mountpoint is outside the jail. PR: 291301 MFC after: 1 week Reviewed by: kib Differential Revision: https://reviews.freebsd.org/D54214 (cherry picked from commit d4f25d0c7957f0f1960028eec82625c2d6405537) --- sys/kern/kern_jail.c | 3 +++ sys/kern/vfs_syscalls.c | 5 +---- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/sys/kern/kern_jail.c b/sys/kern/kern_jail.c index ddfe742178c0..54b06ba803c5 100644 --- a/sys/kern/kern_jail.c +++ b/sys/kern/kern_jail.c @@ -3751,11 +3751,14 @@ prison_enforce_statfs(struct ucred *cred, struct mount *mp, struct statfs *sp) if (pr->pr_enforce_statfs == 0) return; if (prison_canseemount(cred, mp) != 0) { + bzero(&sp->f_fsid, sizeof(sp->f_fsid)); bzero(sp->f_mntonname, sizeof(sp->f_mntonname)); strlcpy(sp->f_mntonname, "[restricted]", sizeof(sp->f_mntonname)); return; } + if (pr->pr_enforce_statfs > 1) + bzero(&sp->f_fsid, sizeof(sp->f_fsid)); if (pr->pr_root->v_mount == mp) { /* * Clear current buffer data, so we are sure nothing from diff --git a/sys/kern/vfs_syscalls.c b/sys/kern/vfs_syscalls.c index 9298d0202c5a..5c59d4dda2fd 100644 --- a/sys/kern/vfs_syscalls.c +++ b/sys/kern/vfs_syscalls.c @@ -293,10 +293,8 @@ kern_do_statfs(struct thread *td, struct mount *mp, struct statfs *buf) error = VFS_STATFS(mp, buf); if (error != 0) goto out; - if (priv_check_cred_vfs_generation(td->td_ucred)) { - buf->f_fsid.val[0] = buf->f_fsid.val[1] = 0; + if (priv_check_cred_vfs_generation(td->td_ucred)) prison_enforce_statfs(td->td_ucred, mp, buf); - } out: vfs_unbusy(mp); return (error); @@ -548,7 +546,6 @@ restart: sptmp = malloc(sizeof(struct statfs), M_STATFS, M_WAITOK); *sptmp = *sp; - sptmp->f_fsid.val[0] = sptmp->f_fsid.val[1] = 0; prison_enforce_statfs(td->td_ucred, mp, sptmp); sp = sptmp; } else