From nobody Sun Feb 1 21:40:59 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 4f438X28vnz6Qjhg for ; Sun, 01 Feb 2026 21:41:00 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f438X0L8Wz3Fsr for ; Sun, 01 Feb 2026 21:41:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769982060; 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=sRRrtKlOmxGv6V9lanYykkxCNNYDLViOiXFQgKSqENI=; b=M91pQygsisg3FuT9FX0obL8P8s843Pb/o+0/0SJ2TuyCMa5I5UrvdnrXbpkbbDvdu9TnUt ITp5JTDSa7LQZj5/QXdVhYnnpTpAAkvooi8OvntplF6qQ417gNEfAvziH/s8ZjkJqYqean JxYEWdnkOfE4m52viZr3gq3gXd9Y/C3s98+6MZtGcXwYCNrP3M+ffHesckhiQSSoUbg/mF O5nwJHygCFNew1Be1Xd85Utoin1NVwbzcrmhRWKllGh9wMmyPwOzOOJrZnA94T2GeKj0tV QAlCBKO2aDnZb/+9+hvACvNfDfTHzHPcuWQbFmwC2VgkYEwS77/uQkblL1gdqQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1769982060; a=rsa-sha256; cv=none; b=i+OIgjX+y0aPsJ4dUi76f6AZrR9P1RPXRvpmCiGrfFhYeAhqTBeFsCKB/PHYk0WzgaUNXB KMTrqN0najjynsGYXY1n6P8MNPIsk8OV79NI3fbop2co5rGvgY84wSL6oKfZS3vqacdYV9 YHa691g7X3rf7Ydsylfk9RvR07bEYOfTOVELlgSzZhf0uCQHZj9zyMMtuynaObVBW2pYbD QANNqQk89PMMjGmcddaBDhAFLYPTB/yqMHoElyD9GNu8nYNpofcoSiq3MAVqPAs01CMXUq Tq6C0C1W6HOvQD61WSgljrt3+kGm4spxr52L3FFMLi55Tf5h1iajMznlRC60ZA== 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=1769982060; 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=sRRrtKlOmxGv6V9lanYykkxCNNYDLViOiXFQgKSqENI=; b=hsQBQEabVraCg7ScMEQmgP/NH1EPtTwW1jtNYqsj/eh5S5fyMDlYJ6tagmGIj5druhxik7 RNYNULtRoie8Ax4hi+N2Wpn7YBiVxvTV3f6zEswjSa/WqGOfXp7t8U4DfHEAU9fgzPZNeD faNtKoDBnYbmEuSwC6HM/oAyAR6lEgdVlFIe+W/CFAF6vYuKRvOe3D7SbXG+qznnjvRZKf 1VRxLFusHAi0KYKfN48QSTRxN2zCaelxBTI9GUqYD0Uo8ENKzkNpLGT+jO7Fh18fkjDXo2 Bdq9GyIj+571aBcsuI+wp9FFu9lzxWQvrKmN1bdY5s6qVBDxbFA+qpT25u7tBg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f438W5FWfzy0x for ; Sun, 01 Feb 2026 21:40:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3dc28 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 01 Feb 2026 21:40:59 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: d4d20337fe70 - stable/15 - procdesc: postpone freeing the zombie' pid until procdesc is freed 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 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: d4d20337fe7092e485cbaeaddabe0f631cac7669 Auto-Submitted: auto-generated Date: Sun, 01 Feb 2026 21:40:59 +0000 Message-Id: <697fc86b.3dc28.78af1ebc@gitrepo.freebsd.org> The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=d4d20337fe7092e485cbaeaddabe0f631cac7669 commit d4d20337fe7092e485cbaeaddabe0f631cac7669 Author: Konstantin Belousov AuthorDate: 2026-01-15 05:28:31 +0000 Commit: Konstantin Belousov CommitDate: 2026-02-01 21:38:49 +0000 procdesc: postpone freeing the zombie' pid until procdesc is freed (cherry picked from commit 09984871d8caff9263b955a94bb9fb5354af1b4c) --- sys/kern/kern_exit.c | 4 ++-- sys/kern/sys_procdesc.c | 4 ++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/sys/kern/kern_exit.c b/sys/kern/kern_exit.c index 1c0e365ecda4..7dfcb8df7fe3 100644 --- a/sys/kern/kern_exit.c +++ b/sys/kern/kern_exit.c @@ -979,10 +979,10 @@ proc_reap(struct thread *td, struct proc *p, int *status, int options) leavepgrp(p); if (p->p_procdesc != NULL) procdesc_reap(p); + else + proc_id_clear(PROC_ID_PID, p->p_pid); sx_xunlock(&proctree_lock); - proc_id_clear(PROC_ID_PID, p->p_pid); - PROC_LOCK(p); knlist_detach(p->p_klist); p->p_klist = NULL; diff --git a/sys/kern/sys_procdesc.c b/sys/kern/sys_procdesc.c index c5db21544b0f..4f5b08003735 100644 --- a/sys/kern/sys_procdesc.c +++ b/sys/kern/sys_procdesc.c @@ -270,6 +270,9 @@ procdesc_free(struct procdesc *pd) KASSERT((pd->pd_flags & PDF_CLOSED), ("procdesc_free: !PDF_CLOSED")); + if (pd->pd_pid != -1) + proc_id_clear(PROC_ID_PID, pd->pd_pid); + knlist_destroy(&pd->pd_selinfo.si_note); PROCDESC_LOCK_DESTROY(pd); free(pd, M_PROCDESC); @@ -389,6 +392,7 @@ procdesc_close(struct file *fp, struct thread *td) */ pd->pd_proc = NULL; p->p_procdesc = NULL; + pd->pd_pid = -1; procdesc_free(pd); /*