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 1534E440628 for ; Wed, 16 Sep 2026 19:49:42 +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=1789588204; cv=none; b=GAXHyNi1CePgAn44Ml+b6k+IkJ1Jp17aav3aGZMWy8UwCpJ2qCjKn8jF+jFym6KTCurJyjo1TwQQI7nQzfbfDbW+zUzBKKk2fKDORO/mnl1ICzjKrIlPXtWSgaGyGePVhq3YY76mpMOODBkkgKKAdYXZk4KjStHqfC4gxkRak9U= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789588204; c=relaxed/simple; bh=0sbLe8kCMGQrC7XlMjNUkk1qOBHoCZbzVSMSzfl5QXU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=S0okHJPMQd7pbnYUzDSaMlEEgf4VBZ8l6yMFSVyoTERG4i51ajIZQPI/imTJ9xopVmE1ZiwbqMEAvheplBX6tDI7G9AaplXRKwAPwscf+VJWye9JKSUfOMoyRf4KmXM4On/O5rTiCnOeVh76g9CQoJ/O/IkdsMRQ24lfwRV/p2s= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=AaMA4r2M; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="AaMA4r2M" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 57B7A1F0089B; Wed, 16 Sep 2026 19:49:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1789588179; bh=Z/rzXlGRWq2J++irdYnhHtARf2lE/9oIs9aXek7J0sg=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=AaMA4r2MmxXRyY2aIccSagXuUBz6ZszxwOjZasdJ2zeyXcOvnmkemI0HIjHf8AmDV AiqCw6bhLhrAH845FHkiIvuXqReEK21kbGl/8j/jjvTB1tVXXKEKyeB0vbSUuMzmY/ V3d2xWSZzPbPbAYsojtC8TYlurwvidgB5itbULUR3tovvrDa9bVV8UT7JZpVTCci8i 2NP6XEK4VGj7AGOcvbweeYjIm9NoEaruZFhsWKOtCyO5e0NeFiD+T9sZ82Yt4LC39J qwktFoWvx3+Xs0xu+A3rUN/4ZlWq2k3oantzMY2Sv1SR6e+RZNz6GWW1TtUI3LWOvV Zb5TOdrON6umA== From: Sasha Levin To: stable@vger.kernel.org Cc: Donggeun Yoo , Sashiko AI , Steven Rostedt , Sasha Levin Subject: [PATCH 6.6.y 3/3] tracing: Undo the registration when enabling the histogram trigger fails Date: Wed, 16 Sep 2026 15:49:35 -0400 Message-ID: <20260916194935.2439878-3-sashal@kernel.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260916194935.2439878-1-sashal@kernel.org> References: <2026091601-uncurled-paddle-226d@gregkh> <20260916194935.2439878-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: Donggeun Yoo [ Upstream commit 92383cef66791a0c63a2f27755cadbdb2fbf270b ] Commit 6f86bdeab633 ("tracing: Fix bad hist from corrupting named_triggers list") described how a trigger that is registered but not on file->triggers ends up freed while still on the global named_triggers list, and moved the registration down so that hist_trigger_enable() follows it immediately. One path still gets there. hist_trigger_enable() adds the trigger and takes it straight back out when the event cannot be enabled: list_add_tail_rcu(&data->list, &file->triggers); update_cond_flag(file); if (trace_event_trigger_enable_disable(file, 1) < 0) { list_del_rcu(&data->list); update_cond_flag(file); ret--; } so the list walk in hist_unregister_trigger() matches nothing, test stays NULL, and the ->free() that would call del_named_trigger() is skipped. out_unreg falls through to out_free, which frees the trigger anyway: BUG: KASAN: slab-use-after-free in find_named_trigger+0xac/0xc0 Read of size 8 at addr ffff8880091d3160 by task init/1 find_named_trigger+0xac/0xc0 hist_register_trigger+0xc1/0xa00 event_hist_trigger_parse+0x3146/0x6af0 event_trigger_write+0xce/0x160 Freed by task 69: kfree+0x154/0x420 trigger_kthread_fn+0xfd/0x160 Leave the trigger where hist_unregister_trigger() can find it and let that undo the registration, which is the only code that knows all of what cmd_ops->init() took: the named list entry, the hist_pad reference, the reference on the trigger a named histogram is shared with, and the copied cmd_ops. It also pairs the failed trace_event_trigger_enable_disable(), whose sm_ref and buffered event reference are otherwise left behind. Since ->free() releases trigger_data and, for a trigger that does not share its histogram, hist_data with it, out_unreg can no longer fall through to out_free. For a trigger that does share, hist_register_trigger() has already destroyed the caller's hist_data, so the fall-through was reading freed memory there as well. Move the enable_timestamps check in hist_unregister_trigger() above the ->free() call for the same reason: hist_data does not outlive it once the trigger being removed is the one that owns it. Cc: stable@vger.kernel.org Fixes: 067fe038e70f ("tracing: Add variable reference handling to hist triggers") Reported-by: Sashiko AI Closes: https://lore.kernel.org/linux-trace-kernel/20260907092944.3950E1F00A3D@smtp.kernel.org/ Link: https://patch.msgid.link/20260907124420.607097-3-donggeunyoo.kernel@gmail.com Signed-off-by: Donggeun Yoo Signed-off-by: Steven Rostedt Signed-off-by: Sasha Levin --- kernel/trace/trace_events_hist.c | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/kernel/trace/trace_events_hist.c b/kernel/trace/trace_events_hist.c index 1ea2eff8a9f66..ee3377ff4d588 100644 --- a/kernel/trace/trace_events_hist.c +++ b/kernel/trace/trace_events_hist.c @@ -6612,11 +6612,12 @@ static int hist_trigger_enable(struct event_trigger_data *data, update_cond_flag(file); - if (trace_event_trigger_enable_disable(file, 1) < 0) { - list_del_rcu(&data->list); - update_cond_flag(file); + /* + * On failure the caller undoes the registration, and + * hist_unregister_trigger() can only find the trigger here. + */ + if (trace_event_trigger_enable_disable(file, 1) < 0) ret--; - } return ret; } @@ -6694,13 +6695,13 @@ static void hist_unregister_trigger(char *glob, } } - if (test && test->cmd_ops->free) - test->cmd_ops->free(test); - if (hist_data->enable_timestamps) { if (!hist_data->remove || test) tracing_set_filter_buffering(file->tr, false); } + + if (test && test->cmd_ops->free) + test->cmd_ops->free(test); } static bool hist_file_check_refs(struct trace_event_file *file) @@ -6905,6 +6906,8 @@ static int event_hist_trigger_parse(struct event_command *cmd_ops, return ret; out_unreg: event_trigger_unregister(cmd_ops, file, glob+1, trigger_data); + /* The unregister frees trigger_data, skip out_free */ + goto out; out_free: remove_hist_vars(hist_data); -- 2.53.0