From nobody Wed Nov 04 16:23:20 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 4jKW2c4qtSz6y9nm for ; Wed, 04 Nov 2026 16:23:20 +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 4jKW2c19TKz4k7q for ; Wed, 04 Nov 2026 16:23:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793809400; 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=JTs1X2e8t3G8Dg5VWjW0elzQAUzHXSVtJX78P1y1Rm4=; b=r0QfvJA2uetgUaFAvsLJjCcHmwal4OMVsNpHTkCDCogLa/BG5ggHTd0rP7cvp68v1Te7aS 0JVR6Bcxxd4/19o/vsUTY4v+GRVtdVnxkPb3IvTXh3Rae/jc4ROkC9ZLQ2flS+/Mc39+0E UxmYpcnZ5lzK9eyucaTNy1tj9gOEZHFmmyxbbWZFU+TUhtADaN3eYYh+jtjEukseYOs8vR xQWmkGEUms9CaTrXDhPRAYWtJjjBhOLuPEd3u7ZSKFnasR1kPYLyfEJt82JrAWFalYxPTc hCIQ0LuKk38MCWNUDpNq4w1cjb0/ZsPk8NawrVD+OqXgPR6ve/QW4tTdeLts1Q== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1793809400; b=LxweXXZ+Vtj7tao3+a5PbKqv6Dhqwih6WQOG2dwoH4gO9p/6/DwqpTV/zk3l/N9p0vYCLB etmsgjpn2KQI3P/1NxEVNU7WJx/XZXFyUYeTcmcmtEv4/YUyzNvQwTygFtynrncChV+8Ty lPXrTOS9FQqOlpgZCHLC1aJ5HlF/8f8tV1UDpqeCGVElNKz+4j3Ld4mLYMP3wtQEqzPnbT f4Knf6D803+KiWiKi3sZQTVgP363p5VoTcKXiCJ4DeMs0pYgj8nerO3g32ZrCmiKOs/YCN Igzde86cVL5XyqNai+rs27QQXsCgimK7Q3QCfeVJ1dqNjSMzMa0xO0M8nkHenw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793809400; 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=JTs1X2e8t3G8Dg5VWjW0elzQAUzHXSVtJX78P1y1Rm4=; b=Y9H727GKIvdUIqI57lVXArARoUtuOdOuiCicBsKOCKDUtyqYnG9TisaEGlnKCU+sLYQuXe DA9AytKkXWRltWlBCfCQw8MGwB6RCRCRM/oCRTtfLnrXGoruawgHta23d2eSZDTAQ97q6D Oxv/AN5cJxGITWQ6e+owsvqRPHezlCmNzt8q74gHnaeLd3GMJfb6djWKvVC8Ikn33kWtVG GMhhDYIE7JJC13tdsH9hjAjtgLBTvgmFGBSN+Td/niyyTaYO2bcZg111KhCc625HTytRMe yoB32XGASCMVfCR8wtp5HyQTkmJaFDUwab+kerIx5XjK+huQj6q2x9NSHd6zbQ== 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 4jKW2c0Y8Pz19YG for ; Wed, 04 Nov 2026 16:23:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1f23b by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 04 Nov 2026 16:23:20 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: f809179ba981 - main - 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 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: f809179ba9811decc518cb5694a289d169a5d6ae Auto-Submitted: auto-generated Date: Wed, 04 Nov 2026 16:23:20 +0000 Message-Id: <6aeb5bf8.1f23b.710232d@gitrepo.freebsd.org> The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=f809179ba9811decc518cb5694a289d169a5d6ae commit f809179ba9811decc518cb5694a289d169a5d6ae Author: Konstantin Belousov AuthorDate: 2026-09-26 16:31:21 +0000 Commit: Konstantin Belousov CommitDate: 2026-11-04 16:23:11 +0000 kern/vfs_syscalls.c: extract privilege check from kern_chroot() Reviewed by: markj Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D60963 --- 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 73a77de49a92..31a7894932bf 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