From nobody Thu Nov 12 11:01:54 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 4jQHX21hgqz70RD6 for ; Thu, 12 Nov 2026 11:01:54 +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 4jQHX20fD3z4M6C for ; Thu, 12 Nov 2026 11:01:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794481314; 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=kc8r055D6K4wJDmpDTdKpK1t6Wr6k4SA39zzTVSk5fw=; b=jTR/jz59hFzTCyiDey/rb+PYUdYMWQ3PkkOm9wqzqqvVJlliKEAZ46a3v9KmJDA2e2ILeE lOJYYxx3oV8slwORnGSCUqyTmA1jIwvxYYpjOmeEqp9Txr+6yDGwO5OHQ+FhWalAADBdUX URGvY+T34EGAIAHPsGD1Kokfqf6v3gQNXo4UWtl1nDF/PKSjmC78NsTbXGLJjKUbmPP3LT /Ti/U+Cv5/ryE4WyS1odlELRLdcfNGxgpuUT2k6dOEIJo4AuvMMfxY9mILxhiAq43CSvQd KdmTJh36mRvzO15Gstu/VASGGfKlTTCpootyNk87gf400Rl4SzQPkJFPTZD1Rw== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1794481314; b=Mv72bfeRD8OaZRqea++z56fsDT4tTt0nk2sNQ7MwXNUD+LsSZEXYohX4nCslOgWMWDh20G KT0bR+cSZsbf+Pf49sVfQu9s3q0llIUhuSWyn70ZbAZyWQUKN79zgpo/JDQmDDeI6ci0c8 ih/OSgXavXm5cC2eUFuffPfLTFosxH5bXu0tDEQfAFbHrKrITM9mKFwsabGKKyIo3RwwCG +5qq7vjslPjxK+yqm1evbRORhoTUtUoOpaddjMkIA7nfdfFHUlfb1HVDtKhXnFSUNfvYkI IRtAJh1vOh9CnjUg9YdGlQfFQYYXnZ3NbJe63IaM6PB9/NALvh0dX47iEmuTuw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794481314; 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=kc8r055D6K4wJDmpDTdKpK1t6Wr6k4SA39zzTVSk5fw=; b=QSBbmcdJaJ+RH1YMP4rAwk8DQg78LuFEubWi2l4uz1RNnqJqAM3iHshOshF0A7CO/doX/E C5QO2T3e6dinIWLX+coEiICS/Y/uzR/GzpN/etH8b3V5TlE/xjmMZOx0HxDwcg0Z8rdY5r OA5sg6GeXrprpEhOAN2MaNwNPHg1BL1wwx2+jYu7w57FhH5WJq1siq8z5q324FFrIgzF56 naYjrXWo3Q72p3WPZjTgVeexwvXEM+h3hfhLMD4NjUO6nK4DnmwfjCHHlzIgMt07Rbe03G h55ur/peOOC8zebKygYrnqFVhCSthmhdOCOUCjIif/2vRvszeCL1NFbY2LmATw== 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 4jQHX20Gxcz10cy for ; Thu, 12 Nov 2026 11:01:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 2018 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 12 Nov 2026 11:01:54 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Brooks Davis Subject: git: 9f47314ebdb6 - main - pdrfork(2): add kern_pdrfork 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: brooks X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9f47314ebdb61a9d7368f2bc75b122d62be5694d Auto-Submitted: auto-generated Date: Thu, 12 Nov 2026 11:01:54 +0000 Message-Id: <6af59ca2.2018.689ad340@gitrepo.freebsd.org> The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=9f47314ebdb61a9d7368f2bc75b122d62be5694d commit 9f47314ebdb61a9d7368f2bc75b122d62be5694d Author: Brooks Davis AuthorDate: 2026-11-12 11:01:30 +0000 Commit: Brooks Davis CommitDate: 2026-11-12 11:01:30 +0000 pdrfork(2): add kern_pdrfork Effort: CHERI upstreaming Sponsored by: DARPA, AFRL Pull Request: https://github.com/freebsd/freebsd-src/pull/2284 --- sys/kern/kern_fork.c | 35 ++++++++++++++++++++--------------- sys/sys/syscallsubr.h | 1 + 2 files changed, 21 insertions(+), 15 deletions(-) diff --git a/sys/kern/kern_fork.c b/sys/kern/kern_fork.c index 839fa1c440f7..9175a48c47ee 100644 --- a/sys/kern/kern_fork.c +++ b/sys/kern/kern_fork.c @@ -209,6 +209,12 @@ sys_rfork(struct thread *td, struct rfork_args *uap) int sys_pdrfork(struct thread *td, struct pdrfork_args *uap) +{ + return (kern_pdrfork(td, uap->fdp, uap->pdflags, uap->rfflags)); +} + +int +kern_pdrfork(struct thread *td, int *fdp, int pdflags, int rfflags) { struct fork_req fr; struct filecaps fcaps; @@ -217,35 +223,34 @@ sys_pdrfork(struct thread *td, struct pdrfork_args *uap) bzero(&fr, sizeof(fr)); fd = -1; - AUDIT_ARG_FFLAGS(uap->pdflags); - AUDIT_ARG_CMD(uap->rfflags); + AUDIT_ARG_FFLAGS(pdflags); + AUDIT_ARG_CMD(rfflags); - if ((uap->rfflags & (RFSTOPPED | RFHIGHPID)) != 0) + if ((rfflags & (RFSTOPPED | RFHIGHPID)) != 0) return (EXTERROR(EINVAL, - "Kernel-only flags %#jx", uap->rfflags)); + "Kernel-only flags %#jx", rfflags)); /* RFSPAWN must not appear with others */ - if ((uap->rfflags & RFSPAWN) != 0) { - if (uap->rfflags != RFSPAWN) + if ((rfflags & RFSPAWN) != 0) { + if (rfflags != RFSPAWN) return (EXTERROR(EINVAL, - "RFSPAWN must be the only flag %#jx", - uap->rfflags)); + "RFSPAWN must be the only flag %#jx", rfflags)); fr.fr_flags = RFFDG | RFPROC | RFPPWAIT | RFMEM | RFPROCDESC; fr.fr_flags2 = FR2_DROPSIG_CAUGHT; } else { - if ((uap->rfflags & (RFPROC | RFPROCDESC)) != + if ((rfflags & (RFPROC | RFPROCDESC)) != (RFPROC | RFPROCDESC)) { return (EXTERROR(EINVAL, - "RFPROC|RFPROCDESC required %#jx", uap->rfflags)); + "RFPROC|RFPROCDESC required %#jx", rfflags)); } - fr.fr_flags = uap->rfflags; + fr.fr_flags = rfflags; } fr.fr_pidp = &pid; fr.fr_pd_fd = &fd; - fr.fr_pd_flags = uap->pdflags; + fr.fr_pd_flags = pdflags; filecaps_fill(&fcaps); - if ((uap->pdflags & PD_PTRACE_CAP) == 0) + if ((pdflags & PD_PTRACE_CAP) == 0) cap_rights_clear(&fcaps.fc_rights, CAP_PTRACE); fr.fr_pd_fcaps = &fcaps; error = fork1(td, &fr); @@ -253,8 +258,8 @@ sys_pdrfork(struct thread *td, struct pdrfork_args *uap) td->td_retval[0] = pid; td->td_retval[1] = 0; if ((fr.fr_flags & (RFPROC | RFPROCDESC)) == - (RFPROC | RFPROCDESC) || uap->rfflags == RFSPAWN) - error = copyout(&fd, uap->fdp, sizeof(fd)); + (RFPROC | RFPROCDESC) || rfflags == RFSPAWN) + error = copyout(&fd, fdp, sizeof(fd)); } return (error); } diff --git a/sys/sys/syscallsubr.h b/sys/sys/syscallsubr.h index f50342308aed..1cda115cf738 100644 --- a/sys/sys/syscallsubr.h +++ b/sys/sys/syscallsubr.h @@ -406,6 +406,7 @@ int kern_openatfp(struct thread *td, int dirfd, const char *path, 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_pdrfork(struct thread *td, int *fdp, int pdflags, int rfflags); int kern_pipe(struct thread *td, int fildes[2], int flags, struct filecaps *fcaps1, struct filecaps *fcaps2); int kern_pipe2(struct thread *td, int *ufildes, int flags);