Date: Sun, 01 Feb 2026 21:40:59 +0000 From: Konstantin Belousov <kib@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Subject: git: d4d20337fe70 - stable/15 - procdesc: postpone freeing the zombie' pid until procdesc is freed Message-ID: <697fc86b.3dc28.78af1ebc@gitrepo.freebsd.org>
index | next in thread | raw e-mail
The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=d4d20337fe7092e485cbaeaddabe0f631cac7669 commit d4d20337fe7092e485cbaeaddabe0f631cac7669 Author: Konstantin Belousov <kib@FreeBSD.org> AuthorDate: 2026-01-15 05:28:31 +0000 Commit: Konstantin Belousov <kib@FreeBSD.org> 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); /*home | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?697fc86b.3dc28.78af1ebc>