From nobody Sun Dec 14 13:46:16 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 4dTkxP1kJqz6KD4h for ; Sun, 14 Dec 2025 13:46:17 +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 4dTkxP0bRDz3kbK for ; Sun, 14 Dec 2025 13:46:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1765719977; 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=cZMfktKBlvKKbG/e3bTenlTSdBi03EcyjQO6Iy1eGEI=; b=fp/6yI+kqmDjSUvfWHaZkKLVZEJub4OynMN9Y1yNeSk7+PHbSQtVpWyZMaGL+J0lny9sB8 IdgqrC8A+2AGAGa9ovBPA20QIUkKeEW6Yvm03//zBuYStfvAw0tT+d8Y5P7B9BESdDdUCq 9MELJNSexNMoqlAzvCYZ2NNZiYdVQ3YMp2nCY8dEc4h+B2OwLlxUNS2V63/Q1izvHpVGPK 5C1rJF1meT36Ihbb1Nwj6oqcaWCRah+hGhKoQHstwuzbgXMTGwVAAUgAfmVbZvlLSNhMjn z7Qjpnj8vzeEA3G9OFfCJ4v5G8nNM/X3aJdJkD3Cu/JbRZfnHU+4utZ/LWql8g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1765719977; 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=cZMfktKBlvKKbG/e3bTenlTSdBi03EcyjQO6Iy1eGEI=; b=ldPnNCRyZ2qDAWPX1m1gSSN3V+B1a3KQKXOjfd1AB02/8zFZ0OGKyF0Cv14eJb5TSfAKp9 m7fZZb69M0520TtVPaHUNV3pK/YiXhYTbPJNwxGptPEmWvG53ynq1vxtz1B1Uq6CZ9s7Pv ZPib2xQd7UgUHgg32UyRew/2rIDoifn6gro3gZqP7hrm5PXRCv6955jL2BO8wJqHFB18am JuLX51g39KFm2RAOwiOPmtrzsp3bJYL+d883W0Qd1CPoa67/JHnC0oszKHsQZnAsGwr3YC cnmBToH4T1FkwGNGw6XUrjiwvAQl3mnmNfk2pyHD/Jd653w7RPzigGHIJ6xpzg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1765719977; a=rsa-sha256; cv=none; b=uOpkB4IbjATuJ+cAjNfdeENxynfHQS/1Aqb9OY4feoPBPwlgolnIlxHKh0OjJflfccWh0x 4AI7dBF2pt4p/+2+Xh/MQiV9AB0+t/LWKlqqB35SHv0vgmNJXfQLbzbKVYUV/Tzn/oTpol L0LQJyNuXQbGCgaElBGP/bRIJxHm926W/pPWhb5PH2JkohEL8fl/2hXU/d12CER4HyC4QN cOUqDby6IQYr13OBaiDFPLgn40NXnbAUG19ko07ac6T5PDdHKbE6DkaZro/wnpFFOrPyg+ qwzW2yAsLldhomJCsWa43NcdmXyyjxGbOcAkU/J7IgxcvrZk5tTmXEVgmauERw== 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 4dTkxN6QB5zc3D for ; Sun, 14 Dec 2025 13:46:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 28a39 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 14 Dec 2025 13:46:16 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav Subject: git: d4f25d0c7957 - main - 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/main X-Git-Reftype: branch X-Git-Commit: d4f25d0c7957f0f1960028eec82625c2d6405537 Auto-Submitted: auto-generated Date: Sun, 14 Dec 2025 13:46:16 +0000 Message-Id: <693ebfa8.28a39.576ae4cc@gitrepo.freebsd.org> The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=d4f25d0c7957f0f1960028eec82625c2d6405537 commit d4f25d0c7957f0f1960028eec82625c2d6405537 Author: Dag-Erling Smørgrav AuthorDate: 2025-12-14 13:16:16 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2025-12-14 13:16:37 +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 --- 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 d1149dd4fb3b..07b98fef8dfb 100644 --- a/sys/kern/kern_jail.c +++ b/sys/kern/kern_jail.c @@ -4117,11 +4117,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 1a739d354f1f..68f155de3db2 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