From nobody Sun Aug 16 02:46:48 2026 X-Original-To: dev-commits-src-branches@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 4hN0jP0ZH4z6pH9X for ; Sun, 16 Aug 2026 02:46:49 +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 4hN0jN5ljNz3f2H for ; Sun, 16 Aug 2026 02:46:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1786848408; 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=9kqEk5IWVjwLV4TpOIKRHuRMRanyYqioRklEMzCXYLU=; b=I7SbHBQ5Vw001nXVrk4rjEYIh4PWNgbDwgJvRZ2QkDkocQKD0KdlctFo0ndLddbF7INQqh 1dbaXHFer/js9TbDzu8k+hzCrpeahw2vtIcsI8vOch+YOHPCVpLRp85sR4/ALs9rR4iRjM 9F6JbkRkvNeAdZa7P0A0Cj2hr9b5Hgf5xGFFfqYrcjjuJ2OVSFsXT1bFq4uMA3CmujYRcR h1rVwf4hvvXEkVltC+vAOrJI27lrBEoZK6Lf0JKemiRjPRQNVDo4yiu5dP//Y9DZzABtN6 sfc3S5qPFacT4/1n8FpeydlgaOPGJbc/2DHwBwG+/hFSd2dcrH5YeC6x9NUuzA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1786848408; a=rsa-sha256; cv=none; b=HOHT2tqqGmhLlDG6FF/D8JrzY19vst8Xwu/4jor73Qi7qXNyxJvWReVCWYmQBaHBkmH93O 6ddilUmqoNqfkASiezMmdKxtC2A5enOPTv+smEvlev8iW6dtrNwZKDfcA97ZA0TQBo3G2f m4+4ntcTcEl0/g1DacRMhN3juJMp7SAa7wUofj+dz2pZPCeVhuzbmOg/uDhB6BupLUEvcJ c2ayCmwodjjYFsE/b9wEvuJGRejeshxqLiAd5XZEWGS2WHraaSV0zXL870xJKCuJDBquXH iaU1JvJeqUTC+t2573D045EqkxNRs/aw9KsY+5XnmBEF39aniIjAkkRRpKwoCg== 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=1786848408; 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=9kqEk5IWVjwLV4TpOIKRHuRMRanyYqioRklEMzCXYLU=; b=iVHUcU9Ppkw9Ypg7irE8lDaNlLT/pjtWrhplSy1Xqp2pjcDnU1zGIjObJMoU4PQ6dnlax1 wURB25pR1urZb16iK9ZdNlG6c8pVzz42gogkzFGVMUhhwCS358ntqV5U0oj7A6cjr8CKar EUpQsfDvnZv57KqdzJWaoaXi/7138GMgPmjkzXhPRGV0AKKfKJE1MjkZgfd6nEWTfUR+hK Lj2ve+Txe/muO8KCu8rzYmhE51Rr3/mkinYPneIZlGJxDzh6ccVJtq3P3K1uUJjkcgXRAO y2VNie2KIns1raH4BGW7eFqcDsifYSYliZrJiaOQbbogjwjlYsVl3sQkXLbHEw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hN0jN4kx8z173S for ; Sun, 16 Aug 2026 02:46:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 45380 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 16 Aug 2026 02:46:48 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 61f4a89823b7 - stable/15 - kern: add pddupfd(2) List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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/stable/15 X-Git-Reftype: branch X-Git-Commit: 61f4a89823b7db38c0e997a135522f1838bfdb86 Auto-Submitted: auto-generated Date: Sun, 16 Aug 2026 02:46:48 +0000 Message-Id: <6a812498.45380.8d097ef@gitrepo.freebsd.org> The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=61f4a89823b7db38c0e997a135522f1838bfdb86 commit 61f4a89823b7db38c0e997a135522f1838bfdb86 Author: Konstantin Belousov AuthorDate: 2026-05-21 19:12:45 +0000 Commit: Konstantin Belousov CommitDate: 2026-08-16 02:41:26 +0000 kern: add pddupfd(2) (cherry picked from commit 1ad21a6521827473dc6692646e9c760a5b0521cd) --- sys/kern/kern_descrip.c | 8 +++-- sys/kern/sys_procdesc.c | 82 ++++++++++++++++++++++++++++++++++++++++++++++++ sys/kern/syscalls.master | 7 +++++ 3 files changed, 95 insertions(+), 2 deletions(-) diff --git a/sys/kern/kern_descrip.c b/sys/kern/kern_descrip.c index b10b7f4f90bb..4fecd55fb5f1 100644 --- a/sys/kern/kern_descrip.c +++ b/sys/kern/kern_descrip.c @@ -3134,6 +3134,7 @@ fget_remote(struct thread *td, struct proc *p, int fd, struct filecaps *fcaps, struct filedesc *fdp; struct file *fp; int error; + bool copied __diagused; /* * Both fcaps and fd_flags must be either requested together, @@ -3158,8 +3159,11 @@ fget_remote(struct thread *td, struct proc *p, int fd, struct filecaps *fcaps, *fd_flags = fde_to_fd_flags(fdp->fd_ofiles[fd]. fde_flags); } - if (fcaps != NULL) - *fcaps = fdp->fd_ofiles[fd].fde_caps; + if (fcaps != NULL) { + copied = filecaps_copy( + &fdp->fd_ofiles[fd].fde_caps, fcaps, true); + MPASS(copied); + } error = 0; } else { error = EBADF; diff --git a/sys/kern/sys_procdesc.c b/sys/kern/sys_procdesc.c index cc3cfa355133..71e8f6797d47 100644 --- a/sys/kern/sys_procdesc.c +++ b/sys/kern/sys_procdesc.c @@ -67,6 +67,7 @@ #include #include #include +#include #include #include #include @@ -705,3 +706,84 @@ sys_pdopenpid(struct thread *td, struct pdopenpid_args *args) return (EINVAL); return (kern_pdopenpid(td, args->pid, args->flags)); } + +static int +kern_pddupfd(struct thread *td, int pdfd, int fd, int flags) +{ + struct proc *p; + struct file *fp, *pfp; + struct procdesc *pd; + struct filecaps fcaps; + uint8_t fd_flags; + int error, fdr; + + error = fget(td, pdfd, &cap_pddupfd_rights, &pfp); + if (error != 0) + return (error); + if (pfp->f_type != DTYPE_PROCDESC) { + error = EBADF; + goto out; + } + pd = pfp->f_data; +again: + sx_slock(&proctree_lock); + p = pd->pd_proc; + if (p != NULL) { + AUDIT_ARG_PROCESS(p); + PROC_LOCK(p); + sx_sunlock(&proctree_lock); + if ((p->p_flag & P_WEXIT) != 0) { + error = ESRCH; + } else { + /* + * Block the target process from entering + * execve(). We need to ensure that the + * p_candebug() predicate is stable until the + * fget_remote() call ends even after the + * process lock is dropped. For that, the + * process must not change uid/suid. + */ + if (!execve_block(td, p)) + goto again; + error = p_candebug(td, p); + if (error == 0) + _PHOLD(p); + else + execve_unblock(td, p); + } + PROC_UNLOCK(p); + if (error != 0) + goto out; + + error = fget_remote(td, p, fd, &fcaps, &fd_flags, &fp); + PROC_LOCK(p); + execve_unblock(td, p); + _PRELE(p); + PROC_UNLOCK(p); + if (error == 0) { + error = finstall_refed(td, fp, &fdr, O_CLOEXEC | + ((fd_flags & FD_RESOLVE_BENEATH) != 0 ? + O_RESOLVE_BENEATH : 0), &fcaps); + if (error != 0) { + fdrop(fp, td); + filecaps_free(&fcaps); + } else { + td->td_retval[0] = fdr; + } + } + } else { + sx_sunlock(&proctree_lock); + error = ESRCH; + } +out: + fdrop(pfp, td); + return (error); +} + +int +sys_pddupfd(struct thread *td, struct pddupfd_args *args) +{ + if (args->flags != 0) + return (EINVAL); + return (kern_pddupfd(td, args->pd, args->fd, args->flags)); +} diff --git a/sys/kern/syscalls.master b/sys/kern/syscalls.master index 41abbdb88075..b4f02e04d9d4 100644 --- a/sys/kern/syscalls.master +++ b/sys/kern/syscalls.master @@ -3428,5 +3428,12 @@ int flags ); } +604 AUE_NULL STD { + int pddupfd( + int pd, + int fd, + int flags + ); + } ; vim: syntax=off