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=1795044244; b=uCiFDh8iE4PjHJ7UzWBUkyQICmlusNqz5lp5qakufN6azSDqDPz9oIGfze+dU+rj1hU1 KpF3odyjwKzdJVHfWQlDLT/1yaQXPd3wg28BYWeZXuVZnNbNsf/0drWmDWG39VB5XaogR kDy5p9dBMdHzSYMPFhz78cW8EyQJketaNWC/WorfqVSmzCYcVwzg87cbrYuCKJlYqo0ZG dvDKFNGxif7aNpSHry2UOzqYhpJywdxN6B+h6JCZb2mUQImoqY/oON1NrDOt+k7UGwDOC vo/Cj0Ax3k8tmE7NUrRasjep5k5TsTN4EKBoWr7/+kuYCHG/ef3ZD0UhX646LjiRmHg== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1795044244; 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=g3TzWBtAQP5kQMnm6355kP9mxmLcutPN50emkyXo2BI=; b=aTQNJH9+97Bes3VaDi/4Hw0ErcbRj2R4akrLHc+SHoxXZwAs0oO97JydTf9As4bbgnm5 8Z4MVL5g95ZMbS3ZrIy8Gdc5JMJBe0u1/zfMLP9u4qQeW/cG/q4m3nHJAeqXozwwfB0jn 7+VhsLXct/MGz4JZgCll4a+MZP9+u6ZwMsUo26x+aIWWuHVF6bHT2rqpOYk9d7uFENbkl c4YvpNxBenAVmXFhru/o3hM0OwZPKkdPpSexveQe2VcL73lC19+JB5AT7NdzsLPR/FIcm PQP6hnupLRFy5wMcnKhZfm3R8VrKwvaNE0sQ0bceMy2SkWAaIj3XtbRu2MZ5KKH22FA== 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=NkUo6S2F; 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 31631606A31C; Wed, 18 Nov 2026 23:24:04 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.a=rsa-sha256 header.s=korg header.b=NkUo6S2F Received: by smtp.kernel.org (Postfix) with ESMTPSA id 856B01F000C4; Wed, 18 Nov 2026 23:24:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1795044244; bh=g3TzWBtAQP5kQMnm6355kP9mxmLcutPN50emkyXo2BI=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=NkUo6S2FTi7X3BuPaOJZtfWu4FP3vp0T1iN0t2WWXVhmzziHhuEszFZdU9e3N8f6P EjIffD9AElsVyeyFx3S+3KImJyX0vUf8gLo02SAEGrkDbvhG0Tbc55E427ySvN6l6l 0oQPDuChnBi8wupArUwjn2YGEb0x87AOAJxsXJkQ= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Donggeun Yoo , Steven Rostedt , Sasha Levin Subject: [PATCH 6.1 0497/2857] tracing: Fix NULL dereference when copying keys for a field variable Date: Wed, 18 Nov 2026 15:25:31 +0100 Message-ID: <20261118150219.348349390@linuxfoundation.org> X-Mailer: git-send-email 2.56.0 In-Reply-To: <20261118150201.293410965@linuxfoundation.org> References: <20261118150201.293410965@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore X-Mailing-List: stable@vger.kernel.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.1-stable review patch. If anyone has any objections, please let me know. ------------------ From: Donggeun Yoo [ Upstream commit a0777b9e53157f1f6848a0fd0650f5465391ea81 ] In event_hist_trigger_parse() where it needs to create actions like "onmatch", it calls: event_hist_trigger_parse() { create_actions() { action_create() { trace_action_create() { trace_action_create_field_var() { create_field_var_hist() Where create_field_var_hist() does a loop on the hist_data representing the keys. The issue is, if the keys uses one of the pseudo field types (like common_cpu), the hist_data field element will have NULL for its field member causing a NULL pointer dereference when accessing the key_field->field->name. # echo 'hist:keys=common_cpu:ts0=common_timestamp.usecs' > \ events/sched/sched_waking/trigger # echo 'my_synth u64 lat; int prio' > synthetic_events # echo 'hist:keys=common_cpu:wakeup_lat=common_timestamp.usecs-$ts0:\ onmatch(sched.sched_waking).my_synth($wakeup_lat,prio)' > \ events/sched/sched_switch/trigger KASAN: null-ptr-deref in range [0x0000000000000010-0x0000000000000017] RIP: 0010:create_field_var_hist+0x771/0x1380 Call Trace: trace_action_create_field_var+0x360/0x600 trace_action_create+0x393/0xe80 event_hist_trigger_parse+0x3e47/0x69e0 trigger_process_regex+0x1a6/0x250 event_trigger_write+0xce/0x160 Instead of accessing it directly, use the proper handler expr_field_str() to get the name. The three previous patches are prerequisites: without them a .buckets key and a common_stacktrace key each render into a command that cannot be parsed back. Cc: stable@vger.kernel.org Link: https://patch.msgid.link/20260914053443.981201-5-donggeunyoo.kernel@gmail.com Fixes: 02205a6752f2 ("tracing: Add support for 'field variables'") Signed-off-by: Donggeun Yoo Assisted-by: Claude:claude-fable-5 Signed-off-by: Steven Rostedt Signed-off-by: Sasha Levin --- kernel/trace/trace_events_hist.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kernel/trace/trace_events_hist.c b/kernel/trace/trace_events_hist.c index a9c9baff6bd77..cd3be7eff31b5 100644 --- a/kernel/trace/trace_events_hist.c +++ b/kernel/trace/trace_events_hist.c @@ -3025,7 +3025,7 @@ create_field_var_hist(struct hist_trigger_data *target_hist_data, key_field = hist_data->fields[i]; if (!first) seq_buf_putc(&s, ','); - seq_buf_puts(&s, key_field->field->name); + expr_field_str(key_field, &s); first = false; } -- 2.53.0