From nobody Fri Nov 20 15:10:51 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 4jWJgc1zrPz71yHL for ; Fri, 20 Nov 2026 15:10:52 +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 4jWJgb74w2z4jQC for ; Fri, 20 Nov 2026 15:10:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1795187452; 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=sXG8erkz3qqdReMUGpZSNEInZE8Tw8AZp8g4u6XvWIc=; b=fqMjBCfp3KDyT0LtH5hG7aH+7Y5EzeCVq123HwSTxPCASwh4JuPktBHUmHjXe8kAUrX/qV PCjatUgptALA4yFl0noQG+Mi1IwKOO8WENKPt5BMjr/foNyDq2nVF7LjZlX65PXdxm+lAt z32i4DrbsUPl29Yth/ItzOSuLbPTxyCYpVXQ3NS3RBN8UfZhp06wfZkHH7l7lW6nO1ecPX iqH9HYbaUWdGlgnCh1e95XRZX/fbpHyiULbJI6VcKMwZ5x4u59Hf7b3lovLGWkhRAIkGr5 TggNf9MvgJIe6YXB1BaqoYGN8NQ2rLSFK4ji/pJ3dEcvIIAvDZEr2DRIx/i6Ew== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1795187452; b=HzL/fNIRuLDvxfeDQWF42lPXBaFZRrVmmiPBWP/OLpASYpVkwTnorW1jQam/gvJRdvxUhK ZfvlWhMAWkh0bmdzZu9ahsGxIsZnARDNC8JEw0p0ox/LBC0YnLUXRzQWC12E+1Jkf+MEBx ZhoTiD7xYv5ndsiYPyg7g/q/tlDMZdrtkmGQIENNpHk/6Ab3HKkQeogyIcstNQrQ4rqfpj OlSkGg/gQzW84IdfN1cHFD6qUMhBamxVLxp52pIoxDjSd+S7Vljd1nD3M8lJy5+2qGUp7i hptGwIiYMY+fJk4AA+8XYezdtZOOJdW1yZnmpN00E1lbxN7ZZARCC08NOcnTkQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1795187452; 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=sXG8erkz3qqdReMUGpZSNEInZE8Tw8AZp8g4u6XvWIc=; b=r5vO58VLiHgFIf6t77S1/4Ck7KsM7kuMMqctz1tYzTMMKPrZf65krBr0zglYj+bqpO/3MP 7QI0CIgRpcdv9uJOT7GXBOo4/kjas5Xa/orStQ76VCBf1AzoRtYjqUts3OwHZkwFtfAk2G frqSA3N/4yG4mqoVLas2t+b+UiO4xscdi9cRS3uRkO/zwCtYFlQq7Spj6wzRyHVxiXYUyk P/NuLfwK0qZCVWQ1UoIK6o96TrUBhruB9G6ceRBkeak8411spkV9VKPSE0H0nbeZRF1Gk7 8t9cYirOkbV++6dKDXtowQjSidf4DgQaLhW8/zG+hivHaK3+Dq8WLaFZok+cwQ== 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 4jWJgb6jH2zt7g for ; Fri, 20 Nov 2026 15:10:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 172cf by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 20 Nov 2026 15:10:51 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 9757c0cf98e4 - main - chaltroot(2) and fchaltroot(2): new syscalls 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/main X-Git-Reftype: branch X-Git-Commit: 9757c0cf98e4fde6b2f2be6ae6095798fbdb95cc Auto-Submitted: auto-generated Date: Fri, 20 Nov 2026 15:10:51 +0000 Message-Id: <6b0062fb.172cf.32cf5bac@gitrepo.freebsd.org> The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=9757c0cf98e4fde6b2f2be6ae6095798fbdb95cc commit 9757c0cf98e4fde6b2f2be6ae6095798fbdb95cc Author: Konstantin Belousov AuthorDate: 2026-09-25 23:49:37 +0000 Commit: Konstantin Belousov CommitDate: 2026-11-20 15:10:26 +0000 chaltroot(2) and fchaltroot(2): new syscalls to change the altroot AKA ABI root for native processes Reviewed by: markj Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D60035 --- sys/kern/syscalls.master | 10 ++++++ sys/kern/vfs_syscalls.c | 85 ++++++++++++++++++++++++++++++++++++++++++++++++ sys/sys/unistd.h | 2 ++ 3 files changed, 97 insertions(+) diff --git a/sys/kern/syscalls.master b/sys/kern/syscalls.master index bf7ae079c6b9..d49e5843ac12 100644 --- a/sys/kern/syscalls.master +++ b/sys/kern/syscalls.master @@ -3452,5 +3452,15 @@ int data ); } +606 AUE_CHALTROOT STD { + int chaltroot( + _In_z_opt_ const char *path + ); + } +607 AUE_FCHALTROOT STD { + int fchaltroot( + int fd + ); + } ; vim: syntax=off diff --git a/sys/kern/vfs_syscalls.c b/sys/kern/vfs_syscalls.c index 225dd09e6c25..484802b3e29d 100644 --- a/sys/kern/vfs_syscalls.c +++ b/sys/kern/vfs_syscalls.c @@ -5424,3 +5424,88 @@ user_copy_file_range(struct thread *td, int infd, off_t *uinoffp, int outfd, error = copyout(outoffp, uoutoffp, sizeof(off_t)); return (error); } + +static int +disable_altdir(struct thread *td) +{ +#ifdef MAC + int error; + + error = mac_vnode_check_chaltroot(td->td_ucred, NULL); + if (error != 0) + return (error); +#endif + return (pwd_altroot(td, NULL)); +} + +static int +change_altdir(struct thread *td, struct vnode *vp) +{ + int error; + + if (vp->v_type != VDIR) { + error = ENOTDIR; + } else { +#ifdef MAC + error = mac_vnode_check_chaltroot(td->td_ucred, vp); + if (error == 0) +#endif + error = VOP_ACCESS(vp, VEXEC, td->td_ucred, td); + } + VOP_UNLOCK(vp); + if (error == 0) + error = pwd_altroot(td, vp); + vrele(vp); + return (error); +} + +int +sys_chaltroot(struct thread *td, struct chaltroot_args *uap) +{ + struct nameidata nd; + int error; + + error = chroot_check_priv(td); + if (error != 0) + return (error); + + if (uap->path == NULL) + return (disable_altdir(td)); + + NDINIT(&nd, LOOKUP, FOLLOW | LOCKLEAF | LOCKSHARED | AUDITVNODE1, + UIO_USERSPACE, uap->path); + error = namei(&nd); + if (error != 0) + return (error); + NDFREE_PNBUF(&nd); + return (change_altdir(td, nd.ni_vp)); +} + +int +sys_fchaltroot(struct thread *td, struct fchaltroot_args *uap) +{ + struct vnode *vp; + struct file *fp; + int error; + uint8_t fdflags; + + error = chroot_check_priv(td); + if (error != 0) + return (error); + + if (uap->fd == FCHALTROOT_DISABLE) + return (disable_altdir(td)); + + error = getvnode_path(td, uap->fd, &cap_fchroot_rights, &fdflags, &fp); + if (error != 0) + return (error); + if ((fdflags & UF_RESOLVE_BENEATH) != 0) { + fdrop(fp, td); + return (ENOTCAPABLE); + } + vp = fp->f_vnode; + vrefact(vp); + fdrop(fp, td); + vn_lock(vp, LK_SHARED | LK_RETRY); + return (change_altdir(td, vp)); +} diff --git a/sys/sys/unistd.h b/sys/sys/unistd.h index 29adf6b59425..2d71212b74c7 100644 --- a/sys/sys/unistd.h +++ b/sys/sys/unistd.h @@ -226,6 +226,8 @@ #define COPY_FILE_RANGE_CLONE 0x00800000 /* Require cloning. */ #define COPY_FILE_RANGE_USERFLAGS (COPY_FILE_RANGE_CLONE) +#define FCHALTROOT_DISABLE (-110) /* Disable altroot by fchaltroot(2). */ + #endif /* __BSD_VISIBLE */ #endif /* !_SYS_UNISTD_H_ */