From nobody Sun Aug 16 02:47:20 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 4hN0k12KsLz6pH5J for ; Sun, 16 Aug 2026 02:47:21 +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 4hN0k03dXmz3fsK for ; Sun, 16 Aug 2026 02:47:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1786848440; 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=pgsrcxb82UaNK594jlJ98W92xon0pzxbeGc47PQYMrw=; b=IC7dxjXwkNwO1n3oLaK2CyDoFrl5OqjODtj+gRIY55mdFgebrstIEtZEsUpj4gTCze8hH2 qbhyEIPBfmVehjsrvptVPe/vFfl7BaM3iuz8PfS8XPJEFiqNzQBZhMRUsusNX2hu48IaZl FwR2KmpGivyODHYk+lcCbek+6lu61JE+61EuGCCjcJLL5mjblKKAx0FwX3BRgVETaISJl1 +JILD6U4VlbuD+eSrxCTncYVJdPY5KXuCnNczeCtNlIhCWf59GeiF99A98hs52tJNSXaEv KVoQH/dhI7GWusNQzAxw5DXVvxwbXwhOQQ0TdJcpe3SPu6XOPYNNCEFtnGmWcA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1786848440; a=rsa-sha256; cv=none; b=vIiN5WdohlQX7nv7UovKBPh+8b4XKjHYwfu7dvAGESnZ0hHPMVE9coYDSCo+qOR4gWu8YS ACXVzVtHQSqPbsYUydX7Hrql6b3wSrnhenPBltCgHife4KIwTJ+Tpjo6ZVrj2RVCDXzTsk KgPT3BI7dV5t71ydQpoLvdveWMleDj/oOPOHNhSrgXE8KyXjufAyknSqd9WOa2CJWI+n3i rxwzomXhJ6RbnqNbao8JKKXi0e3viv9QhindVAvoMonLwGo9c3qkc7I9GRSzDIBSlxsDWM kUQMiCAcen5kPfCny4nRfCklgV3QjzJ49QaxNveAtQqw/VU2g5T5RZYLBZRRPg== 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=1786848440; 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=pgsrcxb82UaNK594jlJ98W92xon0pzxbeGc47PQYMrw=; b=piO+hOBYWye7xdeZs0NU+EwOxSJBc6dfvhoIPE/xAf0Gd4AxKFEEirxzL7Sd+154yfjjdW ADMiCYrkxM1ykB9JxIRdUGCKnF6rIK0F/OeRBUVHR+YrcuYANv828zjM4nVXEpqD7kxCdf CPD+X2NpzKLXXqGlo9jFbEnIZsIuBRJzqOqhqdtnMFrGKuvRFZrrzZlGl8LTBYFcqsW3R3 qV7KoHBndfR3yI74SfxEEPTsun+/SRhis1Wc4rmywTGOimEPndFovx3JQGzDCsLhTHXXlw liYhPR3tr7x+XKeBMWwT7igczeXbISYRomQNKHGvL4yJMiAaV1wZ2mbuJAUFIA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hN0k02SScz18FD for ; Sun, 16 Aug 2026 02:47:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 43ac6 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 16 Aug 2026 02:47:20 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 83fa3c3ad844 - stable/15 - pdkill(2), pdgetpid(2): return EBADF if the file type is not procdesc 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: 83fa3c3ad84405df0ccbe5e65491df63b24782a0 Auto-Submitted: auto-generated Date: Sun, 16 Aug 2026 02:47:20 +0000 Message-Id: <6a8124b8.43ac6.4ede33f@gitrepo.freebsd.org> The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=83fa3c3ad84405df0ccbe5e65491df63b24782a0 commit 83fa3c3ad84405df0ccbe5e65491df63b24782a0 Author: Konstantin Belousov AuthorDate: 2026-08-05 08:04:49 +0000 Commit: Konstantin Belousov CommitDate: 2026-08-16 02:41:39 +0000 pdkill(2), pdgetpid(2): return EBADF if the file type is not procdesc PR: 297293 (cherry picked from commit e8b9b6b9f31c463137b4104550bfb3286a43703a) --- 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