From nobody Fri Jul 24 21:07: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 4h6LCv4tCbz6mkjF for ; Fri, 24 Jul 2026 21:07: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 4h6LCv3xmlz3cJW for ; Fri, 24 Jul 2026 21:07:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1784927243; 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=cu5o7aCNufkV24fe4Vsj2aqiASg9JgP9U3ytpN4FFCU=; b=SDS8KdZklfZ4LMq81hMfzBR1x1dMDzTpKuuVcNeNOt6Xtk1ccg3ZXy6c9FXLhf6iOaI4YE splzECQEPB9ERe3qbP9WILEI6uC+D/fKIirqnXB5dlsDRU9ApV7k9/l7JP9pQR00lo4BbD bfJWugdS4Kh/SpqMa6cJb77xST8FCxiJbU8zuOfZDkTG6Wj4o0dFdVgo4FKR/lQ9Nhaeuf CIBwtTZNDoFefrAQ6mwu0ZvGo9jiFdVSVpCDmAySb+VvsaX7NJrmsNlekI7KA7Hqydk7fZ 55UzIwYGki5M5Vna4SPnujsiPBw7rGbDOjS+dE/m7zkJgDJcx/2xT1O6eQGu2A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1784927243; a=rsa-sha256; cv=none; b=eyuVhV252SD/hdhLecUR1LvFCbXOFs6GON7bMsivUtLez8WE1HQj5F+R25OK6xBnTaz1jW Mvf1U40oNuPuxYYANY5g6y9x5CRUJgGdXKJckfie+fHBWA/RiGTXLOkBru0FvKXb+GuVdY 0ev0TBufeKgO99CzsEo4r60QOWbSqWiPmcWfoqxncqCGPARw7FHcxo4jSqKLVoSnn4K7G7 xhAuFlegoBwAQ8PQoUO7sJkYC3pyA3E1av3WxdTZRDa2lJiudkejP7TDs4rwCXokhD/F7E qeW9PLhmSiqDqjHyEw6nmLwStRP6HVT6LY10zr4b3kTYpa+V6rfnNb9I2Dqs6g== 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=1784927243; 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=cu5o7aCNufkV24fe4Vsj2aqiASg9JgP9U3ytpN4FFCU=; b=IH/uUdx6sZkgfgdojZ368e+T03C6NKokysGIwCUPftvbghiiOIz/GkKEUPiJcctvMuH2eG OkrLz1AYJFaIeNIPuN3tjdCB2VrRhmEe/ny6OHWkDiAZmTO+VbEWrAIAGGZpTxIBdqCbst lzByseozGhtsVwS2dmaA9TX/o6pK6vUo+r0EQkP+cZJonb/fyahsUEZCJSBLlFu51FjHqB KxbWoz9m4Rs0mvwaBc1st0f46WuSV0NGEuk1BAoEm9GcyAMVQ+AsG8R0eXpu5kjDeiGcwE qgdi89OnzC+jZss3dvkpm1JiYfuBPBsIoFzgHwbGZGTtvM9tbGPEwRbX1v8h3w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4h6LCv2q7Nz176t for ; Fri, 24 Jul 2026 21:07:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 38396 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 24 Jul 2026 21:07:23 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 91e11c8f2b38 - main - procdesc: Disallow pddupfd() of non-passable files 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: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 91e11c8f2b38eb1d1f3a1d57b27378fb2c6ab3c1 Auto-Submitted: auto-generated Date: Fri, 24 Jul 2026 21:07:23 +0000 Message-Id: <6a63d40b.38396.1656d619@gitrepo.freebsd.org> The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=91e11c8f2b38eb1d1f3a1d57b27378fb2c6ab3c1 commit 91e11c8f2b38eb1d1f3a1d57b27378fb2c6ab3c1 Author: Mark Johnston AuthorDate: 2026-07-24 20:05:26 +0000 Commit: Mark Johnston CommitDate: 2026-07-24 20:05:26 +0000 procdesc: Disallow pddupfd() of non-passable files Reported by: Maik Muench of Secfault Security Reviewed by: kib Fixes: 1ad21a652182 ("kern: add pddupfd(2)") Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D58403 --- lib/libsys/pdfork.2 | 6 ++++++ sys/kern/sys_procdesc.c | 10 +++++++--- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/lib/libsys/pdfork.2 b/lib/libsys/pdfork.2 index 584c87e17e38..1b99157203c1 100644 --- a/lib/libsys/pdfork.2 +++ b/lib/libsys/pdfork.2 @@ -195,6 +195,8 @@ flag set. The .Fa flags argument is reserved and must be zero. +Certain file descriptor types cannot be copied this way, namely +kqueues. .Pp The following system calls also have effects specific to process descriptors: .Pp @@ -350,6 +352,10 @@ The file descriptor is not a valid file descriptor in the specified process. .It Bq Er ENOENT The specified process does not have a file descriptor table. +.It Bq Er EOPNOTSUPP +.Fa remotefd +refers to a file that cannot be duplicated across a process boundary, +such as a kqueue. .El .Sh SEE ALSO .Xr close 2 , diff --git a/sys/kern/sys_procdesc.c b/sys/kern/sys_procdesc.c index 7fc63256bc05..b913c9109f18 100644 --- a/sys/kern/sys_procdesc.c +++ b/sys/kern/sys_procdesc.c @@ -796,9 +796,13 @@ kern_pddupfd(struct thread *td, int pdfd, int fd, int flags) PROC_UNLOCK(p); error = fget_remote(td, p, fd, &fcaps, &fd_flags, &fp); if (error == 0) { - error = finstall_refed(td, fp, &fdr, O_CLOEXEC | - ((fd_flags & FD_RESOLVE_BENEATH) != 0 ? - O_RESOLVE_BENEATH : 0), &fcaps); + if ((fp->f_ops->fo_flags & DFLAG_PASSABLE) == 0) { + error = EOPNOTSUPP; + } else { + 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);