From nobody Wed Nov 04 16:23:22 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 4jKW2f4rDcz6y9nc for ; Wed, 04 Nov 2026 16:23:22 +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) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 4jKW2f2Yzcz4kb2 for ; Wed, 04 Nov 2026 16:23:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793809402; 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=MHb9pRrC2P8hxwomze2JTPh5jpdh9Tl6rf+to068Ews=; b=yvddl6/NB7ZkvBKloNUVSJFXppJpXQCq7OYtWvM5WCJZdv6k3ugcm0pKEy+Cbo0Huch4Vx xiqh64MgqLkn6WIkcPvrbnufMwvYNnUHT+r40/pV5nKRbNaLeL7EYgtCMLVecVRnYbheC5 cZlBFCivX3fOsjzP8eaIBH3CDKaj5wfalGDggvleQMXGCvt/Yw6xPWvbfp5Z1cKaZqkD6h WZxuNtslr6gm6B+lt+2v0XPKBkYqL8wJqVu2L9gkUZmlekQnssBYAsXj+lPEKgDYhIXRC/ xNGGw0pS6eCYDcvgsnZFeAskAqN8Gd/72CDhJszx9BJmOYvlNpt/KkfWlXP/eA== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1793809402; b=CWXNbdlqh0i1tuJD8heP4FsDSM7GTCFMPehcCI/vULly8QDCX9GJMJbF5AOST7pUHc+RNZ +SHxFPS34vycw7EAi7MYbGlBuj6ATpQg11e/uTfhbGjhCgxRDHGapKMzdqCqy5rXDBf2N3 yyc4h++gmlR0ZBBV35adEuOIXU70RVVp9A/SlaxkB127IbZN8ghlOHRI8r238Bsfe3ee6P ynpyoKcFIVxBRqgedRwXIwuKsePeJdxVfaq2nWnmZ7Tb8ter0N0zlC+BrsFvj9vL0T6zDy 60o9gfe0ZDcKV3voCxuyTIb5nvm9leErexvu0tNZ99OrUDz4xIyHfBv26LFSpQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793809402; 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=MHb9pRrC2P8hxwomze2JTPh5jpdh9Tl6rf+to068Ews=; b=b0evx1Batla/EcyyavGP6Cvt1hge8hzLfNb1zn/E3A+8QQxC9L0+CobF9xXT3rnFdHnjG/ tfZmLQYuHtq43PTtUmipBiIj6MdGMZasMd2WzqFjXHna8YnNmYxUBWVD5I9hZpes2Racd8 rrVceY2Quo7gg8SH2x0mLcwFiO6w+f74g74J7OSRGY4SMk0n1xHPFW0XNksQQ9VhoIONvu Im3p3N5ct6uO7HmQHrH6OewNFN3wLkjkl9CeRIvISqGwm7c2imSQF0zYNq4FBFCOv+6qF4 6EASArD/Xxkkc+W85Nzslzkbpr40u/l9zonNBU34iVMGnFySC+dDkE9+R3Td1g== 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 4jKW2f2Ckkz19Bj for ; Wed, 04 Nov 2026 16:23:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1f23f by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 04 Nov 2026 16:23:22 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: e95e010fd0de - main - kern: do not allow unprivileged chroot when pwd is shared List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: Commit messages for all branches of the src repository 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/main X-Git-Reftype: branch X-Git-Commit: e95e010fd0de721ae0e87bb24e20ec53aec8629e Auto-Submitted: auto-generated Date: Wed, 04 Nov 2026 16:23:22 +0000 Message-Id: <6aeb5bfa.1f23f.32914233@gitrepo.freebsd.org> The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=e95e010fd0de721ae0e87bb24e20ec53aec8629e commit e95e010fd0de721ae0e87bb24e20ec53aec8629e Author: Konstantin Belousov AuthorDate: 2026-10-24 12:59:08 +0000 Commit: Konstantin Belousov CommitDate: 2026-11-04 16:23:11 +0000 kern: do not allow unprivileged chroot when pwd is shared Unprivileged chroot(2), fchroot(2), chaltroot(2), and fchaltroot(2) rely on PROC_NO_NEW_PRIVS to make set-ID images harmless under the new root. But the pwddesc can be shared by rfork(2) without RFFDG with a process that has not enabled PROC_NO_NEW_PRIVS, and the change of the root affects that process as well. It can then execute a set-ID image whose ELF interpreter is resolved under the root controlled by the caller. Refuse the unprivileged operations when the pwddesc is shared. Processes that start sharing it later are created by the caller and inherit PROC_NO_NEW_PRIVS. Reviewed by: markj Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D60963 --- sys/kern/vfs_syscalls.c | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/sys/kern/vfs_syscalls.c b/sys/kern/vfs_syscalls.c index 31a7894932bf..308c1c0297df 100644 --- a/sys/kern/vfs_syscalls.c +++ b/sys/kern/vfs_syscalls.c @@ -972,14 +972,34 @@ SYSCTL_INT(_security_bsd, OID_AUTO, unprivileged_chroot, CTLFLAG_RW, static int chroot_check_priv(struct thread *td) { + struct proc *p; + if (priv_check(td, PRIV_VFS_CHROOT) == 0) return (0); if (unprivileged_chroot == 0) return (EXTERROR(EPERM, "security.bsd.unprivileged_chroot sysctl not enabled")); - if ((td->td_proc->p_flag2 & P2_NO_NEW_PRIVS) == 0) + p = td->td_proc; + if ((p->p_flag2 & P2_NO_NEW_PRIVS) == 0) return (EXTERROR(EPERM, "PROC_NO_NEW_PRIVS not enabled")); + + /* + * Refuse chroot() when the pwd is shared with other + * processes, since they might have been created before + * P2_NO_NEW_PRIVS was set. + * + * The check races with fork(), but the race is harmless. If + * pd_sharecount was observed as 1 and another thread forked + * in the meantime, the child inherited P2_NO_NEW_PRIVS. Then + * neither the parent nor the child can gain privileges by + * executing a set-ID image, which prevents the issues + * otherwise possible due to the pwd sharing. + */ + atomic_thread_fence_acq(); + if (refcount_load(&p->p_pd->pd_sharecount) > 1) + return (EXTERROR(EPERM, + "root/current directory shared with another process")); return (0); }