From nobody Mon Nov 09 11:54:21 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 4jNSqx61WJz6yMVD for ; Mon, 09 Nov 2026 11:54:21 +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 4jNSqx4xQqz3Kdh for ; Mon, 09 Nov 2026 11:54:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794225261; 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=7+PGVchXg2D0TtDeUNK1mKpeuUTSthICeJxYnQSgs1g=; b=gzOWgnAKUU1Dgnl4pb9iNi/lZjUUOKnWt+MRe02kKPGkZwEu1BiSXKZ1OfzIw6qJPUBsrh ziZ34HKXGvq3oQdYSWXYrkJevemHGlUtvau/+YAXZS9yCn8g2OMMY+VAdCEodFrLY4Yu3o g0xkKWfSwHxomuJ/tH8joOODZw0np/uYY1TR7K/EKYY8LZD3/+eJgGQFkZXZQM1CGwu+Q7 AWskSI+OO0pliI8n08OjQ26gRlp8CILU3QcRmHU5s4vOLzI9qmx2q7yVy/oCvqnTq2UWI9 5Qo/T7fh1D6n1yg9lnp3la14WsMbRCd0xGp8C2Lx5ZxBKZS1d7NnjY2J0HlDiQ== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1794225261; b=bygy9+9lDcxhcKg/XuW2D4MTQpFL9TaJoXSG1QdMULEWhJ9HqTQtbALUL6vu6Z7XTIRBZ1 IlnCmvbBTyO61rFUY/bcDupoJ7E0dl13/gRk1vszKHY09dO1XXv1Yl2UugHNkMwzwtqA2y 2wFEo0ciRFv7FYsPwJLKlQf8zJjp3/aVZcoIdXIOIg1b+gqQxeY325RBijKp6rj2XSAMVt kvMWaLpDT+8JOM9IPDyqGFl27NYZRdzAMc/8sJzlqyW9vSFtecoDLuXFvQNax16U0zdfBa pyMqPKpoLY7cE4VjAqrOjB5jAwY2uifZDlRdYBWFz/nU6K0DGzgSp42Rpbcvjg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794225261; 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=7+PGVchXg2D0TtDeUNK1mKpeuUTSthICeJxYnQSgs1g=; b=qXZXbtjuGxmqr/Vbozwskz5YdhKioKrsR6S9cjU++hZfH4DFcpNb/7uVNdzx/V7hiK6IqH 8Eg2T4/q7OUu+V4CbnIXBcAR8AH76Yw7+BPQl0SlVxodWyEwbLp62nRHffXVbklLxrOTef fFCb8rDIDOi1df2Uvm3G6Uz2lxm318BM3Bp3C8cGnNyfs3j8yzXe2/xk68ZHuVcPEnLNca ZYuUmlcqZDCqijlRe4fkfcrf5QQNVNIJ+v3z/BMi31TFDp0dLrHKlVNbEBFOLBEVvb7tSG SxJ9ALew0fvv+6dKDsp0vYKlF3zdW1r6YIBmlbgUkB9OjfzFRKKF3zToByImNw== 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 4jNSqx4FvxzfNX for ; Mon, 09 Nov 2026 11:54:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 46ea by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 09 Nov 2026 11:54:21 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Brooks Davis Subject: git: 7c9060c7f38c - main - pdfork(2): add kern_pdfork 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: brooks X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7c9060c7f38cf07908ee37baa0205848ea2bdaba Auto-Submitted: auto-generated Date: Mon, 09 Nov 2026 11:54:21 +0000 Message-Id: <6af1b46d.46ea.60d82fd5@gitrepo.freebsd.org> The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=7c9060c7f38cf07908ee37baa0205848ea2bdaba commit 7c9060c7f38cf07908ee37baa0205848ea2bdaba Author: Brooks Davis AuthorDate: 2025-11-21 17:33:07 +0000 Commit: Brooks Davis CommitDate: 2026-11-09 11:28:00 +0000 pdfork(2): add kern_pdfork Effort: CHERI upstreaming Sponsored by: Innovate UK Pull Request: https://github.com/freebsd/freebsd-src/pull/2284 --- sys/kern/kern_fork.c | 16 +++++++++++----- sys/sys/syscallsubr.h | 1 + 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/sys/kern/kern_fork.c b/sys/kern/kern_fork.c index a456f0ac1490..839fa1c440f7 100644 --- a/sys/kern/kern_fork.c +++ b/sys/kern/kern_fork.c @@ -70,9 +70,9 @@ #include #include #include +#include #include #include -#include #include #include @@ -123,6 +123,12 @@ sys_fork(struct thread *td, struct fork_args *uap) /* ARGUSED */ int sys_pdfork(struct thread *td, struct pdfork_args *uap) +{ + return (kern_pdfork(td, uap->fdp, uap->flags)); +} + +int +kern_pdfork(struct thread *td, int *fdp, int flags) { struct fork_req fr; struct filecaps fcaps; @@ -132,12 +138,12 @@ sys_pdfork(struct thread *td, struct pdfork_args *uap) fr.fr_flags = RFFDG | RFPROC | RFPROCDESC; fr.fr_pidp = &pid; fr.fr_pd_fd = &fd; - fr.fr_pd_flags = uap->flags; + fr.fr_pd_flags = flags; filecaps_fill(&fcaps); - if ((uap->flags & PD_PTRACE_CAP) == 0) + if ((flags & PD_PTRACE_CAP) == 0) cap_rights_clear(&fcaps.fc_rights, CAP_PTRACE); fr.fr_pd_fcaps = &fcaps; - AUDIT_ARG_FFLAGS(uap->flags); + AUDIT_ARG_FFLAGS(flags); /* * It is necessary to return fd by reference because 0 is a valid file * descriptor number, and the child needs to be able to distinguish @@ -147,7 +153,7 @@ sys_pdfork(struct thread *td, struct pdfork_args *uap) if (error == 0) { td->td_retval[0] = pid; td->td_retval[1] = 0; - error = copyout(&fd, uap->fdp, sizeof(fd)); + error = copyout(&fd, fdp, sizeof(fd)); } return (error); } diff --git a/sys/sys/syscallsubr.h b/sys/sys/syscallsubr.h index 5f91185729cc..fc452fe88647 100644 --- a/sys/sys/syscallsubr.h +++ b/sys/sys/syscallsubr.h @@ -348,6 +348,7 @@ int kern_openatfp(struct thread *td, int dirfd, const char *path, enum uio_seg pathseg, int flags, int mode, struct file **fpp); int kern_pathconf(struct thread *td, const char *path, enum uio_seg pathseg, int name, u_long flags, long *valuep); +int kern_pdfork(struct thread *td, int *fdp, int flags); int kern_pipe(struct thread *td, int fildes[2], int flags, struct filecaps *fcaps1, struct filecaps *fcaps2); int kern_poll(struct thread *td, struct pollfd *fds, u_int nfds,