From nobody Mon Oct 6 16:49:03 2025 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 4cgQG761Z2z69fch; Mon, 06 Oct 2025 16:49:03 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cgQG74mmQz3qc2; Mon, 06 Oct 2025 16:49:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759769343; 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=clMkZyOlSf5S2gXdgTaPu7UN5DLqUZk4E3o+jT90ECc=; b=wuPOLJh42A+qm65uhWueCIsf52/Vit+DUtzZtzh8Lxcber4XCcSIaaIsxtq24MK5nmDJY4 /Nbe9N+X/pHtJ4TRFs7kZjJTNaAIytHS4xK7I8es6f5sNEEr2tu+YV8bvo8TWD5amrhitw Lsh5YDyknsyNFBGe1sIR9VWP5QV17G1gBmJv6ctS6/jxyQ/NKEkB4bTIwXtnK05xiKmBiU 1d8YaE/Q8j8UAn1sXfxUASamVzRPyDdDTvExBbUaGQd3hd+TZ5qk5xlFxKiOhrZuM+19ct IWxY3eH4HQsQmjCm3d0P7fddjc0++M551OHMC7UYywQPeINsZMcdWtevuXzBpg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759769343; 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=clMkZyOlSf5S2gXdgTaPu7UN5DLqUZk4E3o+jT90ECc=; b=B9mPkwGmIRps5IcEE3ymz6REDk8ps92GY51ElTWi3qN36rhoA/QD+5HNvELIlW+KAYS7h+ 35lmASVQqOztrFsj5FmcB5/5UTbVtJyieRuMcnP3vHhWO0fE7LWcc1+TEk5l+8j8+DpbcJ ba0tSAPdnIopW8kM3vtXYapDWXeaXoypBO/tZdCMtbM7OfU6RwlUHrqGpGY4GdJCkfFVfy 40QdmOWVLH26ycUjuRevamQ2zKtLu5E4QakM5BRi6znKY+WW9e2lVO7/UNl8jdWeZsDGjs sRXeH0qtgFsyITmVx8X0iD9dzkQQqBacqu2nmgKhj4IDfH1bpx5m4Q+Zu2xcuQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1759769343; a=rsa-sha256; cv=none; b=FnmrKjnM3AbjMgzzw1wgm/LeRCPsKUpNkAW9426AfmnHPT0DCE8HCyohO/Bxqg8y+4l91Y xDmscDM+AwzfN4gU4h0qJ4ntyhtMVhl9dLMFTVcP53YMgZ2oE0kWKJctetOXd8I+/Quy7J k8gQAV59T9bnuepqSYNzuoNqKmw9/34UfJrY7igh4AHsEF9Zdzpy8Jf2/8W/ZQCEOfuJT3 Cz31hM1Jki4UmdaGN6wl544vm0oI+EXIrfCmNT2hmfOJWGzyjkQoU2OhmAEgoqVMZ2+rD2 zQAq70oAwsWdGh4P7dmcWMagRJvKuxWeXsJzpAVgL/HhVrCXcQ2VUgMMYtu5uA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cgQG74NjVz16Yf; Mon, 06 Oct 2025 16:49:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 596Gn3AH097558; Mon, 6 Oct 2025 16:49:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 596Gn30N097555; Mon, 6 Oct 2025 16:49:03 GMT (envelope-from git) Date: Mon, 6 Oct 2025 16:49:03 GMT Message-Id: <202510061649.596Gn30N097555@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: f19ef352ec63 - main - kern_exit.c: do not leak reaper bitmap busy bits 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 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: f19ef352ec63f9fcc10076a263b8ce402ba31379 Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=f19ef352ec63f9fcc10076a263b8ce402ba31379 commit f19ef352ec63f9fcc10076a263b8ce402ba31379 Author: Konstantin Belousov AuthorDate: 2025-10-01 03:17:31 +0000 Commit: Konstantin Belousov CommitDate: 2025-10-06 16:48:26 +0000 kern_exit.c: do not leak reaper bitmap busy bits When re-assigning p_reapsubtree value, we must check if the result of obliterating the old value would free the corresponding pid in the proc_id_reap bitmap, and indeed free it when needed. PR: 289917 Reported by: avg Reviewed by: avg, markj Tested by: pho Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D52814 --- sys/kern/kern_exit.c | 46 +++++++++++++++++++++++----------------------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/sys/kern/kern_exit.c b/sys/kern/kern_exit.c index a32b5a1b3354..ab8ed32ad189 100644 --- a/sys/kern/kern_exit.c +++ b/sys/kern/kern_exit.c @@ -127,6 +127,27 @@ proc_realparent(struct proc *child) return (parent); } +static void +reaper_clear(struct proc *p, struct proc *rp) +{ + struct proc *p1; + bool clear; + + sx_assert(&proctree_lock, SX_XLOCKED); + LIST_REMOVE(p, p_reapsibling); + if (p->p_reapsubtree == 1) + return; + clear = true; + LIST_FOREACH(p1, &rp->p_reaplist, p_reapsibling) { + if (p1->p_reapsubtree == p->p_reapsubtree) { + clear = false; + break; + } + } + if (clear) + proc_id_clear(PROC_ID_REAP, p->p_reapsubtree); +} + void reaper_abandon_children(struct proc *p, bool exiting) { @@ -138,7 +159,7 @@ reaper_abandon_children(struct proc *p, bool exiting) return; p1 = p->p_reaper; LIST_FOREACH_SAFE(p2, &p->p_reaplist, p_reapsibling, ptmp) { - LIST_REMOVE(p2, p_reapsibling); + reaper_clear(p2, p); p2->p_reaper = p1; p2->p_reapsubtree = p->p_reapsubtree; LIST_INSERT_HEAD(&p1->p_reaplist, p2, p_reapsibling); @@ -152,27 +173,6 @@ reaper_abandon_children(struct proc *p, bool exiting) p->p_treeflag &= ~P_TREE_REAPER; } -static void -reaper_clear(struct proc *p) -{ - struct proc *p1; - bool clear; - - sx_assert(&proctree_lock, SX_LOCKED); - LIST_REMOVE(p, p_reapsibling); - if (p->p_reapsubtree == 1) - return; - clear = true; - LIST_FOREACH(p1, &p->p_reaper->p_reaplist, p_reapsibling) { - if (p1->p_reapsubtree == p->p_reapsubtree) { - clear = false; - break; - } - } - if (clear) - proc_id_clear(PROC_ID_REAP, p->p_reapsubtree); -} - void proc_clear_orphan(struct proc *p) { @@ -972,7 +972,7 @@ proc_reap(struct thread *td, struct proc *p, int *status, int options) sx_xunlock(PIDHASHLOCK(p->p_pid)); LIST_REMOVE(p, p_sibling); reaper_abandon_children(p, true); - reaper_clear(p); + reaper_clear(p, p->p_reaper); PROC_LOCK(p); proc_clear_orphan(p); PROC_UNLOCK(p);