From nobody Fri Dec 19 18:05:59 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 4dXwSl3BpGz6M8sl for ; Fri, 19 Dec 2025 18:05:59 +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 4dXwSl0j5pz44Ct for ; Fri, 19 Dec 2025 18:05:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766167559; 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=mewXLb/z+73QxAKHaZfqIImULBibkIgo3BHIaSvIdz4=; b=V4HmKbUcTUlwLhHeMypLyeJ2XGUPpyj2JrtCgJrnaEoDb8qPRAVKQ3drSVPPgFl+2UKZDz wYNHAMil0H0goEQ7guhcbxX+cmcNKHTikHncTKNHPdkdXfxTUWoosvbRT2qRMopTNaOypH nQqDc57uGO6uDHsS+Xp9XtTBjHgoETqG4PZE3te6/2ggVNMZQCLhiMMRXgMeM6ylpcciqj JFxL1RGQfmFlZevgDQuW583rDijIQCFRsffvMfioNlmqfnbU9HRJr0SsrfSc5qaMhW5c2P eeES0EMXoiaTJ9glr9sksJ8j58qViC13NJue48OJq4EFK5F20EQWIAFjMP0pwg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766167559; 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=mewXLb/z+73QxAKHaZfqIImULBibkIgo3BHIaSvIdz4=; b=DkgetjrthsbvTxEmXHtwn+MZdT6TYhF9hOjxNhVCXeRpsjOA85ZiOMMp1FI8DqpHK/7oR5 jiKv1ndjY77Q7aR91YXIdHNXB/lYw7UpXCkkkZDpiQxZMFkm9+Pm7Bk4uvNTKExRyj3Cb9 6CRh7vkyV/MYPCZCUvBqwxu6iC+kMGus8B1RveGaOuwLmb7mCOPfO+PqF9w8ocHDBP6XVb 4c9rc6baAELJN8/ceRdKcEttGKFI7g/aTVT9GRSe67VbRKPjMNR7J9rq3XsMi30EMlb4PP K+D7AHw4BONhtkC8dQeEt2wDU/iVUvG6uQ3e4TuFdLrznqYJ7cvJh86jOakviA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1766167559; a=rsa-sha256; cv=none; b=ManZRv7BHccYtz0NKxdLBxL+PkGq2/Q1hhlFcZ9B74nKHjzplzCeQarRdpwYXo9u8QiKUM MMSegQfELSArnkBv2oyJbYFeGf9UjThjDBqOz37aOwniZgk9eilUfnF/O5Uod9+QDzx2t4 5laHvA7/YIjbH2PqpbbKyw2+NT79lRxYf5vvS9vYrVizSQAS/0YulylvqyTw8XfuOK5qWf hcuDlIYb1rUw7kaX/F6p/hlrMNWZO5NhupSOh2+nsd+LdSzdNmrFQ64YUuKMXH7IIZOIgJ enQJZnIbVkTTk8NpXf7ihJ1GfEgyDk1DU5fmiOE6ov+sgc2x9dGCc8A6tb3Xyg== 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 4dXwSl0HzQz47g for ; Fri, 19 Dec 2025 18:05:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 231a2 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 19 Dec 2025 18:05:59 +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: faac79511757 - stable/15 - 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/15 X-Git-Reftype: branch X-Git-Commit: faac79511757177ee51e44af0a4e57cee742f390 Auto-Submitted: auto-generated Date: Fri, 19 Dec 2025 18:05:59 +0000 Message-Id: <69459407.231a2.4b03790c@gitrepo.freebsd.org> The branch stable/15 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=faac79511757177ee51e44af0a4e57cee742f390 commit faac79511757177ee51e44af0a4e57cee742f390 Author: Dag-Erling Smørgrav AuthorDate: 2025-12-14 13:16:22 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2025-12-19 18:05:44 +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 599ea374ee8c..49dad70a8380 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 6e56664d12ce..8f86ce349e30 100644 --- a/sys/kern/kern_proc.c +++ b/sys/kern/kern_proc.c @@ -241,11 +241,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); ast_kclear(td); @@ -253,6 +251,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); @@ -281,6 +280,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); }