From nobody Sat Jun 13 01:03:52 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 4gcdS926p7z6hSWY for ; Sat, 13 Jun 2026 01:03:53 +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" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gcdS900tBz3ltm for ; Sat, 13 Jun 2026 01:03:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1781312633; 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=phAciAdBj7L+Ra2FctANy40lPWjLlN1w9KvQDXTH30w=; b=U6yz9ru2gwS1ne1MJ+FmK8HmWwMHBz4dOpDrfWmnvlij/R665HxsZqEdJ30+ThImYXoKPN Q2zSQ17CidaL16cEBa9NCqJbr/Uk/R567/u2OINUUUSWk/c0uxLvILc+/7t2qIZ66/o28h Q0QLwXlNNvjjE+Y5dClRO3g9vdv8PGF3wSSnxw9GmUfTJR7Ety8M46uJefW2H9Jvjf+X1J aHsf+B9CvmlBjvcxZF0qCu8YzTbVhwlx5BtB/mKDQSAk9u03m49HUxsC3HgjLnX9L1zKPT EmY5OP/ioQIQx43mM77k3pkmQust0Z2sB29vFPAk+8cv0HT68ehSJRgbC+Vujg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1781312633; a=rsa-sha256; cv=none; b=lofs69WnGiuIvnfP7mdoQ5KqYne+3AB6ZaIs44flBR/WLDGoE446QTdom8yESRDVJUQzf4 CnBVY9S4krkcjudD2NETHa/sSIgIztV7g8Kf/A/ehvZRXtxsf7sVaLZWhM69KnZg+z9M2o 7lAbuiCoJh2MapNCj4a9+CviPOR+awHLDxpdgy6gWGr5XyDkqoaPPZMg7ij+zUsU07j6rP Vw9A+VhEmMN0igSKmx7xF9+COc8OQVAaIdSHMBFi5KJO8ZyfiDrEePyKoghF+CCNs4NlVk p08hH6HP8Pl4r/r+oF24VQMK1OVz5LfnMR6vjac0OckP8XflXW0w3uqIYXRtvQ== 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=1781312633; 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=phAciAdBj7L+Ra2FctANy40lPWjLlN1w9KvQDXTH30w=; b=pbEBoQFmmwdM0rQpVJbzucJYohYv5OIbriKMhjyWmjTAvCTomuXR4M5EdpXxOXm3OZYUFI GFC3xDipiIcD3mjIsdC3arg5zWIBjP88IZUl1eXDld4INY4dCskyTLmW4miFCsC20qdP91 suuvJ7SNzmXXF/4KNWS5KANHMHBQLybqAg6O4kffc+0au/SiSiBTLIgYLGmNVjdKo9D7QE Q+NutpLNj8sVNoe7s+PCN7oZJYCtyfA8aP8Z+nHd96GsAecLHL8L2KdxcsEuw2HvNKMNIy 9AaKYscyF/LKxRY2b0m1R1GwWXekYHXAq6MZXHtDbDPL5BAdFg6WWvQxIpoesA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gcdS86gm8z11tV for ; Sat, 13 Jun 2026 01:03:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1f452 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 13 Jun 2026 01:03:52 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 5cffd95d23eb - stable/15 - procctl(PROC_REAP_GETPIDS): re-validate reaper after relock of proctree_lock 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: 5cffd95d23ebea181b1f5fe7529382c8d39e26b9 Auto-Submitted: auto-generated Date: Sat, 13 Jun 2026 01:03:52 +0000 Message-Id: <6a2cac78.1f452.678d911b@gitrepo.freebsd.org> The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=5cffd95d23ebea181b1f5fe7529382c8d39e26b9 commit 5cffd95d23ebea181b1f5fe7529382c8d39e26b9 Author: Konstantin Belousov AuthorDate: 2026-06-05 23:29:23 +0000 Commit: Konstantin Belousov CommitDate: 2026-06-13 00:58:35 +0000 procctl(PROC_REAP_GETPIDS): re-validate reaper after relock of proctree_lock (cherry picked from commit 390ae06d4f524a6f32383cbc1bcbdecdb3738bc3) --- sys/kern/kern_procctl.c | 43 ++++++++++++++++++++++++++++++++----------- 1 file changed, 32 insertions(+), 11 deletions(-) diff --git a/sys/kern/kern_procctl.c b/sys/kern/kern_procctl.c index db9de394c101..1ff1b15767b5 100644 --- a/sys/kern/kern_procctl.c +++ b/sys/kern/kern_procctl.c @@ -203,28 +203,49 @@ reap_status(struct thread *td, struct proc *p, void *data) return (0); } +static int +reap_getpids_count(struct proc **reapp, struct proc *p, + const struct procctl_reaper_pids *rp) +{ + struct proc *reap, *p2; + int n; + + sx_assert(&proctree_lock, SX_LOCKED); + + reap = get_reaper_or_p(p); + n = 0; + LIST_FOREACH(p2, &reap->p_reaplist, p_reapsibling) + n++; + if (rp->rp_count < n) + n = rp->rp_count; + *reapp = reap; + return (n); +} + static int reap_getpids(struct thread *td, struct proc *p, void *data) { struct proc *reap, *p2; struct procctl_reaper_pidinfo *pi, *pip; struct procctl_reaper_pids *rp; - u_int i, n; + u_int i, n, n1; int error; rp = data; sx_assert(&proctree_lock, SX_LOCKED); PROC_UNLOCK(p); - reap = (p->p_treeflag & P_TREE_REAPER) == 0 ? p->p_reaper : p; - n = i = 0; - error = 0; - LIST_FOREACH(p2, &reap->p_reaplist, p_reapsibling) - n++; - sx_unlock(&proctree_lock); - if (rp->rp_count < n) - n = rp->rp_count; - pi = malloc(n * sizeof(*pi), M_TEMP, M_WAITOK); - sx_slock(&proctree_lock); + i = 0; + for (;;) { + n1 = reap_getpids_count(&reap, p, rp); + sx_unlock(&proctree_lock); + pi = mallocarray(n1, sizeof(*pi), M_TEMP, M_WAITOK); + sx_slock(&proctree_lock); + n = reap_getpids_count(&reap, p, rp); + if (n <= n1) + break; + free(pi, M_TEMP); + } + LIST_FOREACH(p2, &reap->p_reaplist, p_reapsibling) { if (i == n) break;