From nobody Fri Aug 28 12:05:04 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 4hWcX151c8z6qHP5 for ; Fri, 28 Aug 2026 12:05:05 +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 "YR2" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4hWcX11Csjz3Bs0 for ; Fri, 28 Aug 2026 12:05:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1787918705; 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=fuICw/Z4SopNuOZnwO4m+IqOej/W0gyuyshfPJU9qBc=; b=m1W/BEh03kx/fskwjUsAPti37wV8VUVSLfRFLEJM4L58x3T9/fLJqm9VAD6kVswAclNEGx pzileVvEtunwG1pF4lpD8595kVfl5YiYgKcE7dqhGhx1/z98CYiJGXHc88J3FyRl+tWmA6 BsKCQzx1suml2XjwR6Q3dUuhvVvdg11Fd3NzxRG4RqSEt7ZZEiB6IjTVnHdtpTTjWamxxC KnZ+4XBhgNNPEVBtddcxH4IIIov66ji77XXBkY1CpC/zXbEfDXy6S0hh6vMS3mkJOzZjLP IWPmj4mkxCxyIEjVwK6jSg2BDqnT4PyPbIqDo1z5VTrX2wvPp0kmW6axa5XrFQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1787918705; a=rsa-sha256; cv=none; b=kKJLuWDzqKi7VfV6+vKh588JsH4EMhHmuRGZ2YIj1PuYjdzmfh1tyXaw+dnZ75T3PxdeL/ Bat3PvyPMvvUYVvup1gufB3xNnNhrxEEyPJTXobkjzOt4LdIlJe2nOGKCBSDRYqdToWg0J x71d1E8RjNESUtpuVgV+Ok8y0PnYL9YKha5+we7DeNtTLrYEZt4shvpCdIvfrfTNSoshkk 3BbfL5i6Xkr3I2/LJ2Lx4CSQwB295fhpnkLRtvtBGH3I+jODCUNlJ1s/T3xQ0fUYx9kF5/ mYUFsrXAnTXF1Bzp0QYIc/EOB5YdPMNxIl++bz+WdpKCHuqZ/bUii60KjjnsiQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1787918705; 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=fuICw/Z4SopNuOZnwO4m+IqOej/W0gyuyshfPJU9qBc=; b=I8hQ1gHQGDZXUB2gi5glwFy+3o9P1kNAONMx80SY5hL5jmrljkXqASmoVUb2gNXoOTYvTR RalWyD4Qlft9CTNR0WP1X38Tn0EyR4i99xezx5OrQqLEp9l4QxfCC/j215GFg4WkLWxbnX uJp4c6yxYu0LgNLDNBGoqDCV2kLKdtaol4sQSUA70KTmg9BjqAEC87fQW+gPFA0mF7jgGc Me86loyltgXDYJYEOlz4/gwOUUedk6TbUHpda+D/kHeQf3tbJFB9zo46wCmcD3K82qPUA8 TN0O4lhtIBcnK6eVXlZMi/VnLVEP7NYbHLk1h/6v1Tp7oyGZPuDOEMUnNh1A0g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hWcX05hmmz18CC for ; Fri, 28 Aug 2026 12:05:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 2573d by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 28 Aug 2026 12:05:04 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: e8c313204887 - main - pdfork(2): add PD_PTRACE_CAP flag List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: 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: e8c313204887e7ba47b5c349acbe37d64a3162a1 Auto-Submitted: auto-generated Date: Fri, 28 Aug 2026 12:05:04 +0000 Message-Id: <6a917970.2573d.73664653@gitrepo.freebsd.org> The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=e8c313204887e7ba47b5c349acbe37d64a3162a1 commit e8c313204887e7ba47b5c349acbe37d64a3162a1 Author: Konstantin Belousov AuthorDate: 2026-07-07 23:46:56 +0000 Commit: Konstantin Belousov CommitDate: 2026-08-28 11:52:31 +0000 pdfork(2): add PD_PTRACE_CAP flag If the flag is not specified, the process descriptor returned by either pdfork(2) or pdopenpid(2) has the CAP_PTRACE capability disabled. Reviewed by: markj Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D58586 --- sys/kern/kern_fork.c | 14 ++++++++++++++ sys/kern/sys_procdesc.c | 7 ++++++- sys/sys/procdesc.h | 6 ++++-- 3 files changed, 24 insertions(+), 3 deletions(-) diff --git a/sys/kern/kern_fork.c b/sys/kern/kern_fork.c index 7d2535de987f..182d5ec68b20 100644 --- a/sys/kern/kern_fork.c +++ b/sys/kern/kern_fork.c @@ -41,6 +41,7 @@ #include #include #include +#include #include #include #include @@ -119,6 +120,7 @@ int sys_pdfork(struct thread *td, struct pdfork_args *uap) { struct fork_req fr; + struct filecaps fcaps; int error, fd, pid; bzero(&fr, sizeof(fr)); @@ -126,6 +128,10 @@ sys_pdfork(struct thread *td, struct pdfork_args *uap) fr.fr_pidp = &pid; fr.fr_pd_fd = &fd; fr.fr_pd_flags = uap->flags; + filecaps_fill(&fcaps); + if ((uap->flags & PD_PTRACE_CAP) == 0) + cap_rights_clear(&fcaps.fc_rights, CAP_PTRACE); + fr.fr_pd_fcaps = &fcaps; AUDIT_ARG_FFLAGS(uap->flags); /* * It is necessary to return fd by reference because 0 is a valid file @@ -194,6 +200,7 @@ int sys_pdrfork(struct thread *td, struct pdrfork_args *uap) { struct fork_req fr; + struct filecaps fcaps; int error, fd, pid; bzero(&fr, sizeof(fr)); @@ -226,6 +233,10 @@ sys_pdrfork(struct thread *td, struct pdrfork_args *uap) fr.fr_pidp = &pid; fr.fr_pd_fd = &fd; fr.fr_pd_flags = uap->pdflags; + filecaps_fill(&fcaps); + if ((uap->pdflags & PD_PTRACE_CAP) == 0) + cap_rights_clear(&fcaps.fc_rights, CAP_PTRACE); + fr.fr_pd_fcaps = &fcaps; error = fork1(td, &fr); if (error == 0) { td->td_retval[0] = pid; @@ -1068,6 +1079,7 @@ fork1(struct thread *td, struct fork_req *fr) fr->fr_pd_flags, fr->fr_pd_fcaps); if (error != 0) goto fail2; + fr->fr_pd_fcaps = NULL; AUDIT_ARG_FD(*fr->fr_pd_fd); } @@ -1163,6 +1175,8 @@ fail2: fdclose(td, fp_procdesc, *fr->fr_pd_fd); fdrop(fp_procdesc, td); } + if (fr->fr_pd_fcaps != NULL) + filecaps_free(fr->fr_pd_fcaps); atomic_add_int(&nprocs, -1); cleanup: if (killsx_locked) diff --git a/sys/kern/sys_procdesc.c b/sys/kern/sys_procdesc.c index 0d0ca7b6871c..5ee8a4734248 100644 --- a/sys/kern/sys_procdesc.c +++ b/sys/kern/sys_procdesc.c @@ -692,6 +692,7 @@ kern_pdopenpid(struct thread *td, pid_t pid, int flags) { struct file *fp; struct procdesc *pdf; + struct filecaps fcaps; int error, fd, fflags; error = falloc_noinstall(td, &fp); @@ -701,13 +702,16 @@ kern_pdopenpid(struct thread *td, pid_t pid, int flags) pdf = procdesc_alloc(flags); if ((flags & PD_DAEMON) != 0) fp->f_pdflags |= F_PD_NOKILL; + filecaps_fill(&fcaps); + if ((flags & PD_PTRACE_CAP) == 0) + cap_rights_clear(&fcaps.fc_rights, CAP_PTRACE); sx_xlock(&proctree_lock); error = pdopenpid1(td, pid, &pdf, fp); sx_xunlock(&proctree_lock); if (error == 0) { - error = finstall(td, fp, &fd, fflags, NULL); + error = finstall(td, fp, &fd, fflags, &fcaps); if (error == 0) { td->td_retval[0] = fd; } else { @@ -716,6 +720,7 @@ kern_pdopenpid(struct thread *td, pid_t pid, int flags) * return file descriptor to userspace. */ fp->f_pdflags |= F_PD_NOKILL | F_PD_NOFINSTALL; + filecaps_free(&fcaps); } } fdrop(fp, td); diff --git a/sys/sys/procdesc.h b/sys/sys/procdesc.h index 6cb837af2d3b..f4cba787db01 100644 --- a/sys/sys/procdesc.h +++ b/sys/sys/procdesc.h @@ -161,8 +161,10 @@ __END_DECLS #define PD_DAEMON 0x00000001 /* Don't exit when procdesc closes. */ #define PD_CLOEXEC 0x00000002 /* Close file descriptor on exec. */ #define PD_NOWAITPID 0x00000004 /* Reap without waitpid(). */ +#define PD_PTRACE_CAP 0x00000008 /* Allow PT_PROCDESC in cap mode. */ -#define PD_ALLOWED_AT_FORK (PD_DAEMON | PD_CLOEXEC | PD_NOWAITPID) -#define PD_ALLOWED_AT_OPENPID (PD_DAEMON | PD_CLOEXEC) +#define PD_ALLOWED_AT_FORK \ + (PD_DAEMON | PD_CLOEXEC | PD_NOWAITPID | PD_PTRACE_CAP) +#define PD_ALLOWED_AT_OPENPID (PD_DAEMON | PD_CLOEXEC | PD_PTRACE_CAP) #endif /* !_SYS_PROCDESC_H_ */