From nobody Fri Dec 19 18:07:10 2025 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 4dXwV65n22z6M9NY for ; Fri, 19 Dec 2025 18:07:10 +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 4dXwV63HbQz461n for ; Fri, 19 Dec 2025 18:07:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766167630; 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=jn4bK1rvjkzTGbn4DF6mpLMC42XUW6xlc5AOmSLftd0=; b=rS0qMa3ThOc8FgHZQzAze0z2G5kabb6qYTUkXbBMkbKaUkhv6cqTRdgrJU2ctugvkYdHWQ /rAxHGvVW/k0I47AyhX1DlFu6JxzpC+4XESeRYWv1PjRBfKRpK3IzHiNByDEEExBLT9bc1 kj7kY750Ct/z4jqmL86EJFuQL7OgqfuFq8xFzQX7Vz9lkHrZ1LO7zMmg7cKqKKwnGJZ8Gx KEk9mzkeyRpfbtchrM1mxgffvf2J98NOOvXFAqrxNNV+enxO/j+X+9RZ+GEE1ogm2NynPy PwOyrfm0FYceI3FOpZX7/XMOLzJ90NRKGDz1YD7l+KEYhQxT3iDRM2pXH49i3A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766167630; 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=jn4bK1rvjkzTGbn4DF6mpLMC42XUW6xlc5AOmSLftd0=; b=cs8jesDKgNYtzSFASz4R9bdiQ5/Yw+HNXhLgSBDx7zgXheaJv3vNacdZjXpwuFzyjvvwca bV82+mObLWNkWSX89R2rfc6UvaiUbPH6JwEu+6xqt9vt/aZNGVh7ofX1hu3npz7PBROwKD W5nsFjz5s5L3qCUVB/QtXsdSi/7oNLegUn1vzPTcv6WOMZJ4ZHL4uXT8RrQcWfMHOFyAoK VNFm1G998/VYOgHvE4Knv169u37g52Oebibw5/k06kEh/Zo8UY59KkA2wAEdOgnXJ9y6FX GGF74yGZuUQuOmzEP/ftdoqf7PBjnGFepv0rc1awKTb4umR46ZZH7N8dd8vtgw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1766167630; a=rsa-sha256; cv=none; b=N5+ff2ZyLwlvZ4aKY0UAlqlq92lOmgDrJaSURWFfi8DB+OiIMuT9nJG+2ptWsaAExhFHV/ t7TnReuIfSt9NvNQ5ugELYeE3JFpso3YvYjAv81kMWi5zqOXwCfuObtp1XKoWnL8I9KiIO p0CFryVE8BtXksIDtygG7J0Sq6T2o0H+AsHho9iN0VIJXIgZCA1OY+242Zl8wTcWNEgpgp 4ZAYx3OlncWnHzo5He6y9KlQiyffO5hxnp1oF8mkyYYmkq6rv+87nF5/HGykZXI/0IrIO/ XCm5Kx1qrzyB9wKFG+MLhw7PcmvPRemiskf+AIIyRwDF0BO0PefsgP9XMRgBAA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dXwV62gLyz3ts for ; Fri, 19 Dec 2025 18:07:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 235c0 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 19 Dec 2025 18:07:10 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav Subject: git: 307cbd494b59 - stable/13 - proc: Fix proc_init / proc_dtor ordering issues 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: des X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 307cbd494b593dd3fa6828d2cceb5dc2fc06a517 Auto-Submitted: auto-generated Date: Fri, 19 Dec 2025 18:07:10 +0000 Message-Id: <6945944e.235c0.4aa80ed9@gitrepo.freebsd.org> The branch stable/13 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=307cbd494b593dd3fa6828d2cceb5dc2fc06a517 commit 307cbd494b593dd3fa6828d2cceb5dc2fc06a517 Author: Dag-Erling Smørgrav AuthorDate: 2025-12-14 13:16:22 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2025-12-19 18:07:05 +0000 proc: Fix proc_init / proc_dtor ordering issues * Move the initialization of p_ktr into proc_init() and make the check in proc_dtor() unconditional. Prior to this, it was possible to fail and invoke proc_dtor() after the first thread had been created (which was the condition for checking p_ktr in proc_dtor()) but before p_ktr had been initialized. * Move the p_klist initialization in fork1() past the last possible failure point so we don't have to free it on failure. We didn't, which meant we were leaking a knlist every time we failed to fork due to hitting the resource limit. PR: 291470 MFC after: 1 week Reviewed by: kib Differential Revision: https://reviews.freebsd.org/D54215 (cherry picked from commit 026d962ef14dafe19fa73361bea6dcc95f141dfa) --- sys/kern/kern_fork.c | 4 ++-- sys/kern/kern_proc.c | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/sys/kern/kern_fork.c b/sys/kern/kern_fork.c index 29b3e5d8d682..e3f3fe3ce307 100644 --- a/sys/kern/kern_fork.c +++ b/sys/kern/kern_fork.c @@ -1063,8 +1063,6 @@ fork1(struct thread *td, struct fork_req *fr) #ifdef MAC mac_proc_init(newproc); #endif - newproc->p_klist = knlist_alloc(&newproc->p_mtx); - STAILQ_INIT(&newproc->p_ktr); /* * Increment the count of procs running with this uid. Don't allow @@ -1077,6 +1075,8 @@ fork1(struct thread *td, struct fork_req *fr) chgproccnt(cred->cr_ruidinfo, 1, 0); } + newproc->p_klist = knlist_alloc(&newproc->p_mtx); + do_fork(td, fr, newproc, td2, vm2, fp_procdesc); error = 0; goto cleanup; diff --git a/sys/kern/kern_proc.c b/sys/kern/kern_proc.c index 28c1dd90e685..fd7f786ac1b3 100644 --- a/sys/kern/kern_proc.c +++ b/sys/kern/kern_proc.c @@ -237,11 +237,9 @@ proc_dtor(void *mem, int size, void *arg) p = (struct proc *)mem; td = FIRST_THREAD_IN_PROC(p); if (td != NULL) { -#ifdef INVARIANTS KASSERT((p->p_numthreads == 1), - ("bad number of threads in exiting process")); - KASSERT(STAILQ_EMPTY(&p->p_ktr), ("proc_dtor: non-empty p_ktr")); -#endif + ("too many threads in exiting process")); + /* Free all OSD associated to this thread. */ osd_thread_exit(td); td_softdep_cleanup(td); @@ -250,6 +248,7 @@ proc_dtor(void *mem, int size, void *arg) /* Make sure all thread destructors are executed */ EVENTHANDLER_DIRECT_INVOKE(thread_dtor, td); } + KASSERT(STAILQ_EMPTY(&p->p_ktr), ("proc_dtor: non-empty p_ktr")); EVENTHANDLER_DIRECT_INVOKE(process_dtor, p); #ifdef KDTRACE_HOOKS kdtrace_proc_dtor(p); @@ -278,6 +277,7 @@ proc_init(void *mem, int size, int flags) p->p_stats = pstats_alloc(); p->p_pgrp = NULL; TAILQ_INIT(&p->p_kqtim_stop); + STAILQ_INIT(&p->p_ktr); return (0); }