From nobody Fri Dec 19 18:05:57 2025 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 4dXwSk2HLVz6M9CK for ; Fri, 19 Dec 2025 18:05:58 +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 4dXwSk05t8z44P8 for ; Fri, 19 Dec 2025 18:05:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766167558; 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=YuASrwej5VacWpRy3WWVL1Oqp6LvRhEqKRr4NOvBJys=; b=tiaJ1WnP9VrbNgunCtijHiBqkW+V1wVG3U6f7Zq5UO/uyIL/L6pEAp+r8W+Y9/z2CUEbSS +KhAslkc8QaUXWiWOO9+X8K7qRdD67lHWzt5Is5+kMYe5b3j8rdcKXjrQgC8W5nkv9MTJ/ /Z27fC3cMrqeYwIOntTJBjSHAYsFVGUCpGHfc5/YayFSyoifqck6juGTNQmnP6kr63VEjV ZOZNmn1ui89hpO5nsB6pkmUr7d2rErIFpTiS960MHDQNlwivJT8/aqcgGnaZQbbrEqApy7 bMhFxsEyBPdNrx0rhYezNQiwOaL3tksNnY4RdVhr0DilkzqfbS8nDH/AptKIYQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766167558; 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=YuASrwej5VacWpRy3WWVL1Oqp6LvRhEqKRr4NOvBJys=; b=yFDIyRFEMdAThiSeNE+19a+dIIedNi2RZijBiwKb5t/yYUhQdGueK/tvQF3zfzNRjr6mgi lCmfV8CClGNc2ysutjKMOhIjAmXkkxZCARBalleBeLWsUSW2qFI5l/Y8yo6y91MZ/XdlEr H5ZNRTlWmMVKIeW17tx2QFilhgnmvSEmcThka0FM+8o2q3qqtofEhjP8JzuXQdT5g0J4WO Sy2827E4SaXafJquDXVHDTZdQhuJ4v5azGMK/iWjRy94yiWor7+/7e9/KdDS8HM7QZgFAx sbx3a9mJBBmFa5ogz7XaWCJjGXg37FfMSAQt3Oj/3Nys/nTnCgD/Cm5pqmEE5w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1766167558; a=rsa-sha256; cv=none; b=rcaIw1RpjLDLIKcUs9mO8eCHEE9mubztMLCwVAVaKwt44TvpXvkrAr+V6cCNwP5e1BZOTd LDKdCbiDpMXiD+6u0Tn5m3GBnQabNHIg3tdtTFk+2E9b0QyEDUpJJR71OgTPa4vfbjUqCB MLU41owaq3rdNoD2G001xb5YL32YPJV+mQnqLRlcaNpfECnipTxNYygri7sAGqK61oWWwo XLNJK8dzO254Py+YMTAHzEnBiD/sfHkWFn5BUDpdZZ1mw2oFbM49nf36UEqTp8a5/1g8yM yjCt8Tcz+n6o7ZlKCHIFNNIO9ZqsUmg7MJSl3zzbbmTN3oa3oap9dgQ/sXAoSw== 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 4dXwSj6VfDz3tp for ; Fri, 19 Dec 2025 18:05:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 229eb by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 19 Dec 2025 18:05:57 +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: b43159901f11 - stable/15 - vfs: Let prison_enforce_statfs zero the fsid 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: des X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: b43159901f11cb379176215cc573971c2148d18f Auto-Submitted: auto-generated Date: Fri, 19 Dec 2025 18:05:57 +0000 Message-Id: <69459405.229eb.50f4e87b@gitrepo.freebsd.org> The branch stable/15 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=b43159901f11cb379176215cc573971c2148d18f commit b43159901f11cb379176215cc573971c2148d18f Author: Dag-Erling Smørgrav AuthorDate: 2025-12-14 13:16:16 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2025-12-19 18:05:43 +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 26a994ef0c32..43b485b161a4 100644 --- a/sys/kern/kern_jail.c +++ b/sys/kern/kern_jail.c @@ -4112,11 +4112,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 07c28a2b462a..5eaa9d0ef120 100644 --- a/sys/kern/vfs_syscalls.c +++ b/sys/kern/vfs_syscalls.c @@ -290,10 +290,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); @@ -545,7 +543,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