From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 4DED446D090; Tue, 21 Jul 2026 18:05:31 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784657132; cv=none; b=HVfchJid17377GAyGJHZ69TPSCTcYUhNX9piQNW0kjhnWG5ZHQG3Vs57dOf2NLzvk4AFrN26Q4k6OwVOm8JANef9WRnwZCAgE3Hum7BthGO5nK04TKp/GAPgkQycIPWePnGfxYifdxGZ0Wda9xljIVj8eNpFx0xxZagFPwGadQY= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784657132; c=relaxed/simple; bh=bZxp+5jdKUf0Gbjyuk3wfZoyZwWlEPUUjgt1OfiqteU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=UFydilSKjzylHB/vztMjPKYsd4aef8FsTjF5iHke8cDTv+pbQFOiRFmo9IABvXtb7KRlYOaUgLbfNYJ1LGEoddCK6+EvtqvF/3MtW5nCayX4KrOilk8PtGipQXdLkS1DBwuFAgcXcXyx38UG7FXah/bOajC/gIDyafl2O+ZTauI= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=jPrItkrs; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="jPrItkrs" Received: by smtp.kernel.org (Postfix) with ESMTPSA id B448A1F000E9; Tue, 21 Jul 2026 18:05:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1784657131; bh=4Wx1shxQNRlYRYTQy5LCNmSDVFSREjSvsO0Zarxj7Gg=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=jPrItkrsTOc+HcDQZV8orvMYARq7GPDH99F8WRb+ED8yh2dBinygilKxzx3P/8M4Q QxQDMxunhKj4qoUAnfwLzaAhTSHlK0NfNb9Oq2+1B91WUpNZllCC3+zoFghwPA6/EH Pvc88cDlJ6kjIDLpRnA57AgQzXt6x6LjG9zLciSU= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, sashiko-bot , David Ahern , Namhyung Kim , Arnaldo Carvalho de Melo , Sasha Levin Subject: [PATCH 6.18 0647/1611] perf sched: Clean up idle_threads entry on init failure Date: Tue, 21 Jul 2026 17:12:43 +0200 Message-ID: <20260721152529.944184031@linuxfoundation.org> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260721152514.750365251@linuxfoundation.org> References: <20260721152514.750365251@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.18-stable review patch. If anyone has any objections, please let me know. ------------------ From: Arnaldo Carvalho de Melo [ Upstream commit cda5a94ad9181cd60cbf04be11d524201bf489a2 ] get_idle_thread() allocates a thread via thread__new() and stores it in idle_threads[cpu], then calls init_idle_thread() to set up the private data. If init_idle_thread() fails (e.g. OOM for the idle_thread_runtime struct), the function returns NULL but leaves the partially initialized thread in idle_threads[cpu]. On subsequent calls for the same CPU, get_idle_thread() finds a non-NULL idle_threads[cpu], skips allocation, and returns thread__get() on a thread that has no priv data. Callers then get a thread whose thread__priv() returns NULL, leading to unexpected behavior. Release the thread and reset the slot to NULL on init failure so the entry doesn't persist in a corrupted state. Fixes: 49394a2a24c7 ("perf sched timehist: Introduce timehist command") Reported-by: sashiko-bot Cc: David Ahern Cc: Namhyung Kim Assisted-by: Claude:claude-opus-4.6 Signed-off-by: Arnaldo Carvalho de Melo Signed-off-by: Sasha Levin --- tools/perf/builtin-sched.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tools/perf/builtin-sched.c b/tools/perf/builtin-sched.c index 0b245e8240f6ec..34e974ef49891b 100644 --- a/tools/perf/builtin-sched.c +++ b/tools/perf/builtin-sched.c @@ -2507,8 +2507,11 @@ static struct thread *get_idle_thread(int cpu) idle_threads[cpu] = thread__new(0, 0); if (idle_threads[cpu]) { - if (init_idle_thread(idle_threads[cpu]) < 0) + if (init_idle_thread(idle_threads[cpu]) < 0) { + /* clean up so next call doesn't find a half-initialized thread */ + thread__zput(idle_threads[cpu]); return NULL; + } } } -- 2.53.0