From nobody Sat Aug 2 23:35:24 2025 X-Original-To: dev-commits-src-main@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 4bvfM12fFqz63jGh; Sat, 02 Aug 2025 23:35:25 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bvfM070pZz3xCv; Sat, 02 Aug 2025 23:35:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1754177725; 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=tVMOB6Dt+kaI7YDkuf43T+xz9gSYmHFAGHwlbyRNCB8=; b=ISnf6vYTYg1mdZ2n1ll+LRPvMcKzsn57EW1/9q5ZWZWKMEUn+CN2PBcp4ewbs8QXOF+0aV boCzLRFihDSYyjIWPlneM2Jgw7s7Bb84spPjv5AFWKRArLoaSgCpXdiSWKOoF8RoOlpHRc 3H1ePxuOgsfp316912MSNZCUemXb27Y4jCI2CpGxMT/vmkVa8d5G4y5adWOAYy4ikHWj+4 MCuhf3poKsQxjMupTs6A87fNkC9Z/DF1/WbgipMXzv4oRRADhgnk8bWrlMDOULy2KxLwr8 6GwE/DZew4r8T2SEDoY1oFk0SsWOD9BzQMgXKWWUvb7MGZKrt1hVhMZ/8Xd8tA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1754177725; 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=tVMOB6Dt+kaI7YDkuf43T+xz9gSYmHFAGHwlbyRNCB8=; b=god3A8KDoIJHOvoMxRyJuH3229EV06X3SvGX7wQ3MoD1heHFfdy02No/VzJF7o6sTNLLRM h2ujBPEFMn+GO7zYDjOYYDcasIbKkXYrg9YhC3lPHiilQtXQiaDGWcJitgMkAyS8RqhBlj mpXZD2pNftVDIalDUixaNLbMRQVxLdSrF1s9s0DQfPVEoNl9Y2dODp7ImYdeWHvIiVG5UK Yal42DVe8YbowL/DeXUEMDplHZV8kDURw++z3QbZIu/P0rOWM3u4WxzIgSYlyb3YYz+ZF1 XowoBQPmifx5XQlIyF5YHigEf95usOFroDp9QB4LIlF6D3cK51rD3GV8tgm5IA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1754177725; a=rsa-sha256; cv=none; b=SsVEJOgNiCOp7rVGnUfmTXQfEWepkktul9FnDmHq0hLAdlQQ0BUCgfKovSaAFgVkkBbY+C Kg6tmca6aZe1iQ+QNVRbhHpIyuM289lFLwJX/2MUxRDfYH4idgf8cKE/xFgufiMvXl846K LobqU81x+Fr74VbgnX1mIDFPh72hLL6Vrx4u7kNGQoubuuAYg6fRZUkrIhuY2OKD1BJ1TC wvuownw0XaLXL7/ZkXOpakDHygR9ulh08gJTQWziokooSwN6DfDzxVhJ3Il+Fa9h1bsk4M +FjHD6A26knv3oLBwFo9kL/aWEJyhGAkvijXbGXvkvSEk2FGsJRRuTsxUdfSwg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4bvfM06K0qzfyW; Sat, 02 Aug 2025 23:35:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 572NZOrF004694; Sat, 2 Aug 2025 23:35:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 572NZOgs004691; Sat, 2 Aug 2025 23:35:24 GMT (envelope-from git) Date: Sat, 2 Aug 2025 23:35:24 GMT Message-Id: <202508022335.572NZOgs004691@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: cf0f693f0361 - main - vfs_syscall.c: EXTERROR-ise EPERM from chroot(2) List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org 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: cf0f693f0361e76517cabc234321ce7870fa8f9f Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=cf0f693f0361e76517cabc234321ce7870fa8f9f commit cf0f693f0361e76517cabc234321ce7870fa8f9f Author: Konstantin Belousov AuthorDate: 2025-08-02 18:01:06 +0000 Commit: Konstantin Belousov CommitDate: 2025-08-02 23:28:00 +0000 vfs_syscall.c: EXTERROR-ise EPERM from chroot(2) Reviewed by: emaste, kevans Sponsored by: The FreeBSD Foundation Differential revision: https://reviews.freebsd.org/D51708 --- sys/kern/vfs_syscalls.c | 12 ++++++++++-- sys/sys/exterr_cat.h | 1 + 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/sys/kern/vfs_syscalls.c b/sys/kern/vfs_syscalls.c index a0e56a8fd8a7..9704e9c160a8 100644 --- a/sys/kern/vfs_syscalls.c +++ b/sys/kern/vfs_syscalls.c @@ -37,6 +37,7 @@ #include "opt_capsicum.h" #include "opt_ktrace.h" +#define EXTERR_CATEGORY EXTERR_CAT_VFSSYSCALL #include #ifdef COMPAT_FREEBSD11 #include @@ -46,6 +47,7 @@ #include #include #include +#include #include #include #include @@ -982,8 +984,14 @@ kern_chroot(struct thread *td, struct vnode *vp) error = priv_check(td, PRIV_VFS_CHROOT); if (error != 0) { p = td->td_proc; - if (unprivileged_chroot == 0 || - (p->p_flag2 & P2_NO_NEW_PRIVS) == 0) { + 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; } } diff --git a/sys/sys/exterr_cat.h b/sys/sys/exterr_cat.h index 80cff53b3576..43f31e1d5dd6 100644 --- a/sys/sys/exterr_cat.h +++ b/sys/sys/exterr_cat.h @@ -20,6 +20,7 @@ #define EXTERR_CAT_GENIO 6 #define EXTERR_CAT_BRIDGE 7 #define EXTERR_CAT_SWAP 8 +#define EXTERR_CAT_VFSSYSCALL 9 #endif