From nobody Tue Jul 7 23:28:23 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 4gvy8R3slYz6kCJ6 for ; Tue, 07 Jul 2026 23:28:23 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gvy8R212Yz3FGb for ; Tue, 07 Jul 2026 23:28:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1783466903; 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=M9c5AGN5X2337z1oC+QCxx6hC5yVKo2r6tnhYjvtriY=; b=lq1YyMijjXhO5fmOU5uSRsQbVE73GrLzXyL684iJl5cR8QS3f0VdJQAX9yKX1Zua+27qW4 RNA+XM7lG8aJkyPBfh2TpyFZKpoN9+WyleUrT2ciCwxti0Tq+510JMLJcOdj92zci83OLu MjYqyMXPldvkxoZl3ZghoadbIeIxCjid+NMRl22cc4E+0DvjruJY0ALw/aslkYnxh1Mh48 TdodLSgPMqzJJ3ZZzrRbgoYZqYZPNwn66ZFhHoAaArBvWInPV/uDHNNkivYGXBBywpGx9H ZrqQjNsRBVCLQaYrwM3pP1S/Lsv6Q31qfCJ6jmtblZqv+1ZgZF2W3fYmY9FQvw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1783466903; a=rsa-sha256; cv=none; b=N6KuRBTmi55CBEIJRUuQUohSXcyl+HlMKEl1odYIXaxXMSkjtjb8mGbHwfrVXBscRzdKrm BvKE04cZCRP00z2Fv535ADz9UxSeGnAsb/JDvLRBBltIz4xLhZrqPrxSj5x1mIcy8T+uGK VabPUZoTxW4Nyt9/fUNd/Mkaqgc4der0o30tDuqm7Df6BhWw92QJMk8GNTBR3cvKxPM3uW jXQh0elUb2nDR9PLoJYt9ZfTrM5NdPLmgBAjdCa2T9zlxDp22Gh4I0YfmxjYAbPVEUtHZ1 PktanOgcSAKxtVJFm4p+ORJ8tsDF2zcka0ySEbUDd9yb9++OLCSWVXRnvtQIbQ== 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=1783466903; 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=M9c5AGN5X2337z1oC+QCxx6hC5yVKo2r6tnhYjvtriY=; b=UVD3g/+e7lfAUroCZaTG802t8BnlGVZM7r60u+3azYiihdXnAF8Gr2VG87lVpPnlP7EtZr W6+bILizV/52JztOOCBYiQ7xC1cbZxgPkcEFTxpJFwrTG53e2tl9z9xtTG1xK9ND2JPC8s F3oikobwWst2Wlt+FB04ExaQumnMzZSVuc0H00tX5ATb/AocJbUsloUVVNkRIYgKsMgwiS T8htV2U9eU7QIU0C4FFQr7pvSLSwUkWcyCVchnmdb40gJGcD2Ovv31f26srgZMPNLyuOMx GV6AEII0nbRSuw3wPeuLwXvSUgHopZ0neRrzv5BU2RpdIoj6iIYLyn81wF5JRQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gvy8R0zZpzwWS for ; Tue, 07 Jul 2026 23:28:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 314ba by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 07 Jul 2026 23:28:23 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 1ad21a652182 - main - kern: add pddupfd(2) 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: 1ad21a6521827473dc6692646e9c760a5b0521cd Auto-Submitted: auto-generated Date: Tue, 07 Jul 2026 23:28:23 +0000 Message-Id: <6a4d8b97.314ba.6044989@gitrepo.freebsd.org> The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=1ad21a6521827473dc6692646e9c760a5b0521cd commit 1ad21a6521827473dc6692646e9c760a5b0521cd Author: Konstantin Belousov AuthorDate: 2026-05-21 19:12:45 +0000 Commit: Konstantin Belousov CommitDate: 2026-07-07 22:03:53 +0000 kern: add pddupfd(2) Reviewed by: markj Tested by: pho Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D57163 --- 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 351cc1917b04..8272d6da9b0a 100644 --- a/sys/kern/kern_descrip.c +++ b/sys/kern/kern_descrip.c @@ -3162,6 +3162,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, @@ -3186,8 +3187,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 4749a9b8bf7e..7351df11c631 100644 --- a/sys/kern/sys_procdesc.c +++ b/sys/kern/sys_procdesc.c @@ -67,6 +67,7 @@ #include #include #include +#include #include #include #include @@ -702,3 +703,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 8ea32a7b0058..4bc5385f76e7 100644 --- a/sys/kern/syscalls.master +++ b/sys/kern/syscalls.master @@ -3435,5 +3435,12 @@ int flags ); } +604 AUE_NULL STD { + int pddupfd( + int pd, + int fd, + int flags + ); + } ; vim: syntax=off