From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=100.103.45.18 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1793209837; b=2E1IzlSExhBsjAG/zJWU0sZbIZ48BJoibVpzHMjFwJhhU/dnVzbsLEVkqXZW7xAJsaoT Q67mW4m+/Knx7upkJYHH0BXNlhYLda8gmppD3ABS55WNLhxq47MJFjw0ISy79bHwiyJSz jmE5+l87v3Li+JA3ra3/s+NpPRZ6TERRcEh7WZnk/upa+FCokfsOZs5HHA1wjNSGo5SP6 O2zVmmzA51CtimgXIX+nvM7oNzHg2+UPnQG/J44VbTDDrAVxypt+iGTG9IFzaYS8vcLsV GpaBVH8ohNt7e1tN91lK89LBdZGVPcpv4yp4+Jq17JRf+64QHseexx69q8OGTSMEBEQ== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1793209837; h=Received:DKIM-Signature:From:To:Cc:Subject:Date:Message-ID:X-Mailer: In-Reply-To:References:User-Agent:X-stable:X-Patchwork-Hint: MIME-Version:Content-Transfer-Encoding; bh=pVCXypWGC4nb1DX+VpQGupO1PD60rijpXAbjd2na/E0=; b=pkxwKvAxzU/TcL92KLoKJyg5fsPBZD9zW/6m0P39bjjmApLTElWoU9oxGMTzoPRwkghL s4SwEW8OP2jpvjnWg2L8aiPbHA0aapxzQQ66gs/WWFjOBg8e706EsXmJoXjcPeKndqg5b a8qxwknLL9iItlw75ny/5gJAZS+BNs/+B3E5JgTn0DvvqXpbE+hZnjButHDHaF53zdkHV QpY6simCsLfgdjq8UC5PdQbp0Em/ckT5qKx0+k603XftQ+oJXRrwJ9vq8PFQUBpnuAzDo HmCtQU6aqbgB8+i6ZKaCYQX1PZV5DdkeLmuX5YOXTeHsFGQ04AiyoQhqhRCBN7LKZSQ== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass header.d=linuxfoundation.org header.i=@linuxfoundation.org header.a=rsa-sha256 header.s=korg header.b=Mwm8vMv6; arc=none smtp.remote-ip=100.103.45.18 Received: from smtp.kernel.org (quasi.space.kernel.org [100.103.45.18]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id E5EFA606A31A; Wed, 28 Oct 2026 17:50:36 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key, unprotected) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.a=rsa-sha256 header.s=korg header.b=Mwm8vMv6 Received: by smtp.kernel.org (Postfix) with ESMTPSA id 44E371F01825; Wed, 28 Oct 2026 17:50:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1793209836; bh=pVCXypWGC4nb1DX+VpQGupO1PD60rijpXAbjd2na/E0=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=Mwm8vMv65MU2PlNoNC0kCivbttzDxiooP7Qdrjf56tMflP91RSeQ/iIraAXt4Qc/y 1w2hgWzKXM0Pb9QDXfh7jA+wCsGf5/InbslWZYPyOliNQIzfESrpS1hktutr5iXVwN ax7EmPH9BvuHmJnYJQFOzksC3g5Vrtra4H2lUXEg= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Sashiko , Donggeun Yoo , Tom Zanussi , Steven Rostedt Subject: [PATCH 6.18 038/109] tracing: Save the event file instead of the compatible histogram Date: Wed, 28 Oct 2026 18:00:22 +0100 Message-ID: <20261028165943.258096547@linuxfoundation.org> X-Mailer: git-send-email 2.56.0 In-Reply-To: <20261028165942.357251485@linuxfoundation.org> References: <20261028165942.357251485@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore X-Mailing-List: patches@lists.linux.dev List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.18-stable review patch. If anyone has any objections, please let me know. ------------------ From: Donggeun Yoo commit d5c42664fc094899af9aae5300b27fe8fdb658ef upstream. create_field_var_hist() creates a histogram on the matched event to supply a field variable, and records it on the target so it can be torn down later: hist_data = find_compatible_hist(target_hist_data, file); ... /* Save the compatible histogram information */ var_hist->hist_data = hist_data; hist_data is not the histogram it creates. It is one that was already there, whose keys the new one copies. The saved pointer has a single user, unregister_field_var_hists(), which runs when the target is removed: file = hist_data->field_var_hists[i]->hist_data->event_file; find_compatible_hist() matches on keys alone, so it can pick one with no variables of its own. check_var_refs() then returns false and the user can remove it while the target still points at it: BUG: KASAN: slab-use-after-free in event_hist_trigger_free+0x2b2/0x320 Read of size 8 at addr ffff8880093b90e0 by task init/1 Freed by task 1: kfree+0x154/0x420 event_hist_trigger_free+0x1d5/0x320 event_hist_trigger_parse+0x35f3/0x69e0 trigger_process_regex+0x1a6/0x250 Save the event file instead. It is all the dereference ever wanted, and it does not go away when the user removes a trigger. Cc: stable@vger.kernel.org Reported-by: Sashiko Link: https://lore.kernel.org/all/20260914110753.221E61F000FF@smtp.kernel.org/ Link: https://patch.msgid.link/20260914234754.3676905-1-donggeunyoo.kernel@gmail.com Fixes: 02205a6752f2 ("tracing: Add support for 'field variables'") Signed-off-by: Donggeun Yoo Assisted-by: Claude:claude-fable-5 Acked-by: Tom Zanussi Signed-off-by: Steven Rostedt Signed-off-by: Greg Kroah-Hartman --- kernel/trace/trace_events_hist.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) --- a/kernel/trace/trace_events_hist.c +++ b/kernel/trace/trace_events_hist.c @@ -544,7 +544,7 @@ struct field_var { }; struct field_var_hist { - struct hist_trigger_data *hist_data; + struct trace_event_file *file; char *cmd; }; @@ -3098,8 +3098,8 @@ create_field_var_hist(struct hist_trigge return ERR_PTR(-ENOMEM); } - /* Save the compatible histogram information */ - var_hist->hist_data = hist_data; + /* Needed to remove the histogram when the target goes away */ + var_hist->file = file; /* Create the new histogram with our variable */ ret = event_hist_trigger_parse(&trigger_hist_cmd, file, @@ -6327,7 +6327,7 @@ static void unregister_field_var_hists(s int ret; for (i = 0; i < hist_data->n_field_var_hists; i++) { - file = hist_data->field_var_hists[i]->hist_data->event_file; + file = hist_data->field_var_hists[i]->file; cmd = hist_data->field_var_hists[i]->cmd; ret = event_hist_trigger_parse(&trigger_hist_cmd, file, "!hist", "hist", cmd);