From nobody Wed Aug 5 18:16:43 2026 X-Original-To: dev-commits-src-main@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 4hFdsS1xfsz6mwVJ for ; Wed, 05 Aug 2026 18:16:44 +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 4hFdsR74jmz3dv1 for ; Wed, 05 Aug 2026 18:16:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1785953804; 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=e0yPEKha6KcRWN79/gj0srC0rQFhO4lad33VTOZWHQ0=; b=yB/t1ut1mCbEzHKdC4vtjqcyY8zmGcwxJ3pQ0/CiAt2TXvW1JWSnQ+jIrvMOJ/QL473hny RvCdcGkOCRhRgmW9eTNmETjns/5CK8m8dJV9/G+fka7Sotd9bTRP0G4OAmjTsAoyY/8IXb cML44+nDVqwyb0xPOhMpyYGv5M4UtpzXcqTuJICzGcXIK4jK9R9wvAWEQEfVJI0REDFZ2C dbw3aDaY1tyfm7rWOlXVIBoiWJol9+ltYih85zoYs522lASPjHIGpcmLchGGCZ9/YKWHq4 5ZsBRxk5XVQkENAYFR87UQjREX6n9uJuVvjxX4HaVUXcS6xVD2HVVpF2cLen3Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1785953804; a=rsa-sha256; cv=none; b=VOklhDOkz3/ZilyE0DnqzcK+1SiibskPWLkjwbywRuZ5LmumE7FWvRb0DHdPgQlOSxecEe +cmfGZ7iL0KD8OSMeO6lhMNN2CyrrohY9pM5yBWScywUdq+ZH8hUFx6C1ZmwPrHuTf/rC2 st3gGaquvG+2s61DHNFxpIXX+w/lvZ4z2o25+HvWfeVQ74zwSxWDxoILsTgAAJvhsEq32e +xxqL4U56N5tO3MBckbflQmv4vz2+1keUKsfZti6SrlvN8fAa44Xf90bnBvznZWY0kzk7z gkJ7NT0IuPF5bCeWZfCrKmEOake/47VUw4x09dBfQLeeo7E96yCn19gEGGl0Jg== 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=1785953804; 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=e0yPEKha6KcRWN79/gj0srC0rQFhO4lad33VTOZWHQ0=; b=HRdetForlbl/pxG4ZdtQrgU9kqoyHGjiNhPR9f/ZkLammayxJuTu6VpizcVMl/7qIkeLUR cdcaZuXDgWk9j9aj+uTt0vsrfnwLxi5KE+O3DUAICHVGXteXDeG4sY8uSZtJ1IjFz7ofO7 Rym1IkTfOsbbE3FwnthLGAbTdwh28NYeqCgdqBx88ZqyPBmIlxH2SS0bwjQiiWNFF9sWII nboEQ3oieO4W0czIjfnCBhB5YcsqKkkPZROE0+rQgKS+rNB1jbrus/PpZxovK8fOmFmAdX fgQ2Iep1pPA6JHIL/OjbcmVnsZURRz0Rv2gawikwhUba2cp2CVI9zO1NfE51Ng== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hFdsR5hyszlnC for ; Wed, 05 Aug 2026 18:16:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 32a3c by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 05 Aug 2026 18:16:43 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: e8b9b6b9f31c - main - pdkill(2), pdgetpid(2): return EBADF if the file type is not procdesc List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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: e8b9b6b9f31c463137b4104550bfb3286a43703a Auto-Submitted: auto-generated Date: Wed, 05 Aug 2026 18:16:43 +0000 Message-Id: <6a737e0b.32a3c.11aad7f4@gitrepo.freebsd.org> The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=e8b9b6b9f31c463137b4104550bfb3286a43703a commit e8b9b6b9f31c463137b4104550bfb3286a43703a Author: Konstantin Belousov AuthorDate: 2026-08-05 08:04:49 +0000 Commit: Konstantin Belousov CommitDate: 2026-08-05 18:15:54 +0000 pdkill(2), pdgetpid(2): return EBADF if the file type is not procdesc For pdwait(2) and pddupfd(2), the returned error is kept EINVAL. PR: 297293 Reviewed by: lwhsu, markj Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D58666 --- sys/kern/kern_exit.c | 3 ++- sys/kern/kern_sig.c | 3 ++- sys/kern/sys_procdesc.c | 10 ++++++---- sys/sys/procdesc.h | 4 ++-- 4 files changed, 12 insertions(+), 8 deletions(-) diff --git a/sys/kern/kern_exit.c b/sys/kern/kern_exit.c index efdd51e2ec97..fa1721fbaede 100644 --- a/sys/kern/kern_exit.c +++ b/sys/kern/kern_exit.c @@ -1563,7 +1563,8 @@ kern_pdwait(struct thread *td, int fd, int *status, if (error != 0) return (error); - error = fget_procdesc(td, fd, &cap_pdwait_rights, &fp, &pd, NULL); + error = fget_procdesc(td, fd, &cap_pdwait_rights, EINVAL, &fp, + &pd, NULL); if (error != 0) goto exit_unlocked; diff --git a/sys/kern/kern_sig.c b/sys/kern/kern_sig.c index 27ab109d2ac5..629ce1c3c40a 100644 --- a/sys/kern/kern_sig.c +++ b/sys/kern/kern_sig.c @@ -1965,7 +1965,8 @@ sys_pdkill(struct thread *td, struct pdkill_args *uap) return (EINVAL); sx_slock(&proctree_lock); - error = fget_procdesc(td, uap->fd, &cap_pdkill_rights, &fp, NULL, &p); + error = fget_procdesc(td, uap->fd, &cap_pdkill_rights, EBADF, &fp, + NULL, &p); sx_sunlock(&proctree_lock); if (error != 0) goto out; diff --git a/sys/kern/sys_procdesc.c b/sys/kern/sys_procdesc.c index 289b9f100897..0d0ca7b6871c 100644 --- a/sys/kern/sys_procdesc.c +++ b/sys/kern/sys_procdesc.c @@ -142,7 +142,7 @@ kern_pdgetpid(struct thread *td, int fd, const cap_rights_t *rightsp, struct file *fp; int error; - error = fget_procdesc(td, fd, rightsp, &fp, NULL, NULL); + error = fget_procdesc(td, fd, rightsp, EBADF, &fp, NULL, NULL); if (error == 0) *pidp = procdesc_pid(fp); if (fp != NULL) @@ -753,7 +753,8 @@ sys_pdopenpid(struct thread *td, struct pdopenpid_args *args) */ int fget_procdesc(struct thread *td, int pdfd, const cap_rights_t *cap_rights, - struct file **pfp, struct procdesc **pdp, struct proc **pp) + int wrong_type_error, struct file **pfp, struct procdesc **pdp, + struct proc **pp) { struct file *fp; struct procdesc *pd; @@ -769,7 +770,7 @@ fget_procdesc(struct thread *td, int pdfd, const cap_rights_t *cap_rights, return (error); *pfp = fp; if (fp->f_type != DTYPE_PROCDESC) - return (EINVAL); + return (wrong_type_error); pd = fp->f_data; if (pp != NULL) { p = pd->pd_proc; @@ -795,7 +796,8 @@ kern_pddupfd(struct thread *td, int pdfd, int fd, int flags) int error, fdr; sx_slock(&proctree_lock); - error = fget_procdesc(td, pdfd, &cap_pddupfd_rights, &pfp, NULL, &p); + error = fget_procdesc(td, pdfd, &cap_pddupfd_rights, EINVAL, &pfp, + NULL, &p); if (error == 0) { if ((p->p_flag & P_WEXIT) != 0) { error = ESRCH; diff --git a/sys/sys/procdesc.h b/sys/sys/procdesc.h index 0c923509f6eb..6cb837af2d3b 100644 --- a/sys/sys/procdesc.h +++ b/sys/sys/procdesc.h @@ -122,8 +122,8 @@ void procdesc_fill_winfo(struct procdesc *pd, bool proc_locked); int procdesc_falloc(struct thread *, struct file **, int *, int, struct filecaps *); int fget_procdesc(struct thread *td, int pfd, - const cap_rights_t *cap_rights, struct file **pfp, - struct procdesc **pdp, struct proc **pp); + const cap_rights_t *cap_rights, int wrong_type_error, + struct file **pfp, struct procdesc **pdp, struct proc **pp); #else /* !_KERNEL */ #include