From: Steven Rostedt <rostedt@kernel.org>
To: linux-kernel@vger.kernel.org
Cc: Masami Hiramatsu <mhiramat@kernel.org>,
Mark Rutland <mark.rutland@arm.com>,
Mathieu Desnoyers <mathieu.desnoyers@efficios.com>,
Andrew Morton <akpm@linux-foundation.org>,
stable@vger.kernel.org,
Donggeun Yoo <donggeunyoo.kernel@gmail.com>
Subject: [for-linus][PATCH 15/20] tracing: Fix memory corruption from the histogram stacktrace modifier
Date: Fri, 11 Sep 2026 14:16:51 -0400 [thread overview]
Message-ID: <20260911181731.228624014@kernel.org> (raw)
In-Reply-To: <20260911181636.485043797@kernel.org>
From: Donggeun Yoo <donggeunyoo.kernel@gmail.com>
parse_field() sets HIST_FIELD_FL_STACKTRACE from the ".stacktrace"
modifier before it looks the field name up, and nothing afterwards
checks that the name resolved to a field which holds a stacktrace.
create_hist_field() picks HIST_FIELD_FN_STACK on the strength of the
field pointer alone, which reads a __data_loc word from the record and
follows its low 16 bits as an offset into the same record.
event_hist_trigger() takes the first word there as an entry count and
copies that many longs into a 31 entry array:
n_entries = *stack;
memcpy(entries, ++stack, n_entries * sizeof(unsigned long));
Neither end of that copy is bounded, and the count is whatever the event
holds at the offset, so any field will do:
# cd /sys/kernel/tracing/events/sched/sched_process_fork
# echo 'hist:keys=parent_pid.stacktrace' > trigger
# (true)
BUG: kernel NULL pointer dereference, address: 0000000000000008
RIP: 0010:rb_insert_color+0x18/0x130
timerqueue_linked_add+0x7e/0xd0
enqueue_hrtimer+0x39/0xb0
__hrtimer_run_queues+0x10f/0x1f0
</IRQ>
RIP: 0010:memcpy+0xc/0x30
event_hist_trigger+0x165/0x690
The timer interrupt landed on the rbtree the copy had already run over.
No debug options are needed for this; KASAN reports the same write as an
out-of-bounds read of 13835058055416381440 bytes.
Documentation/trace/histogram.rst already states the rule, "must be a
long[] type", so enforce it once the name has been resolved. Names which
resolve to no field at all, "hitcount.stacktrace" and the common_*
pseudo-fields, are refused for the same reason: they hold no stacktrace
to read.
Cc: stable@vger.kernel.org
Fixes: cc5fc8bfc961 ("tracing/histogram: Add stacktrace type")
Link: https://patch.msgid.link/20260907155045.692664-2-donggeunyoo.kernel@gmail.com
Signed-off-by: Donggeun Yoo <donggeunyoo.kernel@gmail.com>
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
---
kernel/trace/trace_events_hist.c | 12 ++++++++++--
1 file changed, 10 insertions(+), 2 deletions(-)
diff --git a/kernel/trace/trace_events_hist.c b/kernel/trace/trace_events_hist.c
index 53100287466f..9bc829c1e876 100644
--- a/kernel/trace/trace_events_hist.c
+++ b/kernel/trace/trace_events_hist.c
@@ -2317,6 +2317,7 @@ parse_field(struct hist_trigger_data *hist_data, struct trace_event_file *file,
struct ftrace_event_field *field = NULL;
char *field_name, *modifier, *str;
struct trace_array *tr = file->tr;
+ bool stack_modifier = false;
modifier = str = kstrdup(field_str, GFP_KERNEL);
if (!modifier)
@@ -2339,9 +2340,10 @@ parse_field(struct hist_trigger_data *hist_data, struct trace_event_file *file,
*flags |= HIST_FIELD_FL_EXECNAME;
else if (strcmp(modifier, "syscall") == 0)
*flags |= HIST_FIELD_FL_SYSCALL;
- else if (strcmp(modifier, "stacktrace") == 0)
+ else if (strcmp(modifier, "stacktrace") == 0) {
*flags |= HIST_FIELD_FL_STACKTRACE;
- else if (strcmp(modifier, "log2") == 0)
+ stack_modifier = true;
+ } else if (strcmp(modifier, "log2") == 0)
*flags |= HIST_FIELD_FL_LOG2;
else if (strcmp(modifier, "usecs") == 0)
*flags |= HIST_FIELD_FL_TIMESTAMP_USECS;
@@ -2412,6 +2414,12 @@ parse_field(struct hist_trigger_data *hist_data, struct trace_event_file *file,
}
}
}
+
+ if (stack_modifier &&
+ (!field || field->filter_type != FILTER_STACKTRACE)) {
+ hist_err(tr, HIST_ERR_BAD_FIELD_MODIFIER, errpos(field_str));
+ field = ERR_PTR(-EINVAL);
+ }
out:
kfree(str);
--
2.53.0
next prev parent reply other threads:[~2026-09-11 18:16 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-09-11 18:16 [for-linus][PATCH 00/20] tracing: Fixes for v7.3 Steven Rostedt
2026-09-11 18:16 ` [for-linus][PATCH 01/20] tracing/user_events: Dont destroy fields when event removal fails Steven Rostedt
2026-09-11 18:16 ` [for-linus][PATCH 02/20] ftrace: fork: Initialize function graph state before copy_exec_state() Steven Rostedt
2026-09-11 18:16 ` [for-linus][PATCH 03/20] fgraph: Remove unused FGRAPH_MAX_INDEX Steven Rostedt
2026-09-11 18:16 ` [for-linus][PATCH 04/20] function_graph: Use the saved entrys size when reprinting it Steven Rostedt
2026-09-11 18:16 ` [for-linus][PATCH 05/20] tracing: Free histogram var refs regardless of how often they are referenced Steven Rostedt
2026-09-11 18:16 ` [for-linus][PATCH 06/20] tracing: Free histogram the var ref when its initialization fails Steven Rostedt
2026-09-11 18:16 ` [for-linus][PATCH 07/20] tracing: Free histogram the field rejected for a bad modifier Steven Rostedt
2026-09-11 18:16 ` [for-linus][PATCH 08/20] tracing: Keep the entry count when the histogram stats allocation fails Steven Rostedt
2026-09-11 18:16 ` [for-linus][PATCH 09/20] tracing: Let histogram values keep the percent and graph modifiers Steven Rostedt
2026-09-11 18:16 ` [for-linus][PATCH 10/20] tracing: Fix typo "availabe" in comment Steven Rostedt
2026-09-11 18:16 ` [for-linus][PATCH 11/20] tracing: Fix typo "preceeded" " Steven Rostedt
2026-09-11 18:16 ` [for-linus][PATCH 12/20] tracing: Set the trace clock before registering the histogram trigger Steven Rostedt
2026-09-11 18:16 ` [for-linus][PATCH 13/20] tracing: Take the reference before publishing the named " Steven Rostedt
2026-09-11 18:16 ` [for-linus][PATCH 14/20] tracing: Undo the registration when enabling the histogram trigger fails Steven Rostedt
2026-09-11 18:16 ` Steven Rostedt [this message]
2026-09-11 18:16 ` [for-linus][PATCH 16/20] tracing: Fix memory corruption from a "STACKTRACE" histogram key Steven Rostedt
2026-09-11 18:16 ` [for-linus][PATCH 17/20] tracing: Restore :mod: trailer after parsing in ftrace_set_clr_event() Steven Rostedt
2026-09-11 18:16 ` [for-linus][PATCH 18/20] tracing: Fix ring_buffer_read_page_size() kernel-doc Steven Rostedt
2026-09-11 18:16 ` [for-linus][PATCH 19/20] tracing: Take trace_array reference when opening a tracer options file Steven Rostedt
2026-09-11 18:16 ` [for-linus][PATCH 20/20] ring-buffer: Acquire the lock with irqsave in rb_wake_up_waiters() Steven Rostedt
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20260911181731.228624014@kernel.org \
--to=rostedt@kernel.org \
--cc=akpm@linux-foundation.org \
--cc=donggeunyoo.kernel@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mark.rutland@arm.com \
--cc=mathieu.desnoyers@efficios.com \
--cc=mhiramat@kernel.org \
--cc=stable@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®