From nobody Wed Nov 11 01:06:58 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 4jPQN32NC0z6y1nS for ; Wed, 11 Nov 2026 01:06:59 +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 4jPQN30Gqhz4nC1 for ; Wed, 11 Nov 2026 01:06:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794359219; 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=Fw2bHTs4U0YEH+5WjyZlk0HBB+TX/lyfe8mFf4gfbOw=; b=M0C3wucsJ5sA6HCyshVYAw+6Sb6hm96nlx6bMjP4ZazO9FZNEbO9WBLinSVtmOt2J3+9kj +5wAQbcv1dZrZKUxukMjMRALv+8JLnnUj0pkDWa1Pngd+ua9nAZzMk6qOM2HGpZl6HVW9w NF/SidBHAXu3aoksvgjGtnHFDN7xR2cytvFqNtwagIAqMQ5tnlzCngudnc9QujekbkWhyY RI5/56MdBVaV7u50FyUq0FyH37p5iLPLgg2xdzKDcEzoVTHbSGevjoNEDyFty1npjRTPvr yjZj3eXYAKJ1x9USV0Ovlsrc/U4hZoOnG/aE5ZIwy2MqjbQLFzYVXOvRhKSzMQ== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1794359219; b=eDfUfsIrNAbESJf6QMOqdV886quNFETCRdPh44imu5JThBNkZITtiaXKx2SxDjMAtKDCyv rKx4zfpwLruxOjIU3UPxeZcYsVuH08xmhxLVIuccbSDGKyECGH0S6BBNY+pCjA1QNZjHHm EnvRWzDcd3irQ3LI3fvCslhe+TtOzdYqmQmd5dWPtZr8o29EJ1yNyBZsHpMcA/tCXrsHzc dvUELYAwacoLWUq4eCZ/2yy+JW4p32MjspRcq65Fmur3wBYI+MSEx7t0gJgmmV9amCN74I H7zHNR93Ecw1gbjknpqsI2ZKtfQNoItWn6DU6P492b5rVv+MiqDOY7yAwP1/tQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794359219; 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=Fw2bHTs4U0YEH+5WjyZlk0HBB+TX/lyfe8mFf4gfbOw=; b=dX/cKivLXuy2pLrgzQU7lGFO2K7FqO8eB1gm64ccLyaG7TIyCYdw1INjtUpIZieGX48p2l Gsalijxir/lJnwUWBk3uvKQDJXI608BKc9HTcRWX0T6R//f0jDTeRAc2Cjhfpj+wlvxFqM gBHhGAOuzt07ZuBZ9+pLBhct6quSvZQ/XfuewqrXn6sxnPwxT3SAju4FMITtDufGHr45lt Fe55U08cyq3SgpipOBh5rPN33ebpZxoi6Z6KT0guIGM+02df9kMy+KW3TuUWVsaexDkgzQ XFkHCoLK5zpZ1BF5vaUNgSR8jpliCbImyzX0c3IhVku59++oZbpuQUQ7zV4/mQ== 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 4jPQN26DKLzscX for ; Wed, 11 Nov 2026 01:06:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 20b63 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 11 Nov 2026 01:06:58 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: a79aca4b320b - stable/15 - kern/vfs_syscalls.c: extract privilege check from kern_chroot() List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all X-BeenThere: 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/stable/15 X-Git-Reftype: branch X-Git-Commit: a79aca4b320bf31e6b72eff900760326201e5cae Auto-Submitted: auto-generated Date: Wed, 11 Nov 2026 01:06:58 +0000 Message-Id: <6af3bfb2.20b63.753b9998@gitrepo.freebsd.org> The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=a79aca4b320bf31e6b72eff900760326201e5cae commit a79aca4b320bf31e6b72eff900760326201e5cae Author: Konstantin Belousov AuthorDate: 2026-09-26 16:31:21 +0000 Commit: Konstantin Belousov CommitDate: 2026-11-10 19:53:56 +0000 kern/vfs_syscalls.c: extract privilege check from kern_chroot() (cherry picked from commit f809179ba9811decc518cb5694a289d169a5d6ae) --- sys/kern/vfs_syscalls.c | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/sys/kern/vfs_syscalls.c b/sys/kern/vfs_syscalls.c index 620fbcc1def9..1aecd7f7d5a8 100644 --- a/sys/kern/vfs_syscalls.c +++ b/sys/kern/vfs_syscalls.c @@ -969,31 +969,31 @@ SYSCTL_INT(_security_bsd, OID_AUTO, unprivileged_chroot, CTLFLAG_RW, &unprivileged_chroot, 0, "Unprivileged processes can use chroot(2)"); +static int +chroot_check_priv(struct thread *td) +{ + 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) + return (EXTERROR(EPERM, + "PROC_NO_NEW_PRIVS not enabled")); + return (0); +} + /* * Takes locked vnode, unlocks it before returning. */ static int kern_chroot(struct thread *td, struct vnode *vp) { - struct proc *p; int error; - error = priv_check(td, PRIV_VFS_CHROOT); - if (error != 0) { - p = td->td_proc; - if (unprivileged_chroot == 0) { - error = EXTERROR(EPERM, - "security.bsd.unprivileged_chroot sysctl not enabled"); - goto e_vunlock; - } - if ((p->p_flag2 & P2_NO_NEW_PRIVS) == 0) { - error = EXTERROR(EPERM, - "PROC_NO_NEW_PRIVS not enabled"); - goto e_vunlock; - } - } - - error = change_dir(vp, td); + error = chroot_check_priv(td); + if (error == 0) + error = change_dir(vp, td); if (error != 0) goto e_vunlock; #ifdef MAC