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, sashiko-bot@kernel.org,
Donggeun Yoo <donggeunyoo.kernel@gmail.com>
Subject: [for-linus][PATCH 08/20] tracing: Keep the entry count when the histogram stats allocation fails
Date: Fri, 11 Sep 2026 14:16:44 -0400 [thread overview]
Message-ID: <20260911181729.830006531@kernel.org> (raw)
In-Reply-To: 20260911181636.485043797@kernel.org
From: Donggeun Yoo <donggeunyoo.kernel@gmail.com>
print_entries() uses n_entries both as the number of sort entries and as
its own return value, so the -ENOMEM it stores when the stats allocation
fails overwrites the count that the cleanup still needs:
n_entries = tracing_map_sort_entries(map, ...);
if (n_entries < 0)
return n_entries;
...
if (!stats) {
n_entries = -ENOMEM;
goto out;
}
...
out:
tracing_map_destroy_sort_entries(sort_entries, n_entries);
tracing_map_destroy_sort_entries() takes an unsigned int and loops up to
it, so -ENOMEM arrives as 4294967284. It walks an array of at most
map->max_elts pointers and calls destroy_sort_entry(), which dereferences
and frees, on whatever lies past the end.
Reading the hist file of a trigger with a .percent value, with that
allocation forced to fail:
BUG: KASAN: vmalloc-out-of-bounds in tracing_map_destroy_sort_entries+0xa0/0xb0
Read of size 8 at addr ffffc90000045000 by task init/1
tracing_map_destroy_sort_entries+0xa0/0xb0
hist_show+0x6f7/0x1df0
seq_read_iter+0x2b8/0x1190
vfs_read+0x176/0xa40
The buggy address belongs to a 4-page vmalloc region starting at
ffffc90000041000 allocated at tracing_map_sort_entries+0x5c/0xd50
A few pages further the fault is fatal. The registers at the oops confirm
the bound: the loop's end pointer less the array start, over the pointer
size, is 4294967284.
Return the error in a separate variable and leave n_entries holding the
count, the way tracing_map_sort_entries() does on its own error path.
The stats block is only entered for a value carrying .percent or .graph,
which __create_val_field() has rejected since v6.3, so this cannot be
reached in mainline as it stands. It becomes reachable again with
"tracing: hist: let values keep the percent and graph modifiers", so it
should be applied first.
Cc: stable@vger.kernel.org
Fixes: abaa5258ce5e ("tracing: Add .percent suffix option to histogram values")
Link: https://patch.msgid.link/20260907060323.480728-1-donggeunyoo.kernel@gmail.com
Reported-by: sashiko-bot@kernel.org
Closes: https://lore.kernel.org/all/20260907053113.1CED91F00A3A@smtp.kernel.org/
Signed-off-by: Donggeun Yoo <donggeunyoo.kernel@gmail.com>
Acked-by: Masami Hiramatsu (Google) <mhiramat@kernel.org>
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
---
kernel/trace/trace_events_hist.c | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/kernel/trace/trace_events_hist.c b/kernel/trace/trace_events_hist.c
index 8cad99a8d01e..8d80562fb502 100644
--- a/kernel/trace/trace_events_hist.c
+++ b/kernel/trace/trace_events_hist.c
@@ -5677,7 +5677,7 @@ static int print_entries(struct seq_file *m,
{
struct tracing_map_sort_entry **sort_entries = NULL;
struct tracing_map *map = hist_data->map;
- int i, j, n_entries;
+ int i, j, n_entries, ret;
struct hist_val_stat *stats = NULL;
u64 val;
@@ -5687,6 +5687,8 @@ static int print_entries(struct seq_file *m,
if (n_entries < 0)
return n_entries;
+ ret = n_entries;
+
/* Calculate the max and the total for each field if needed. */
for (j = 0; j < hist_data->n_vals; j++) {
if (!(hist_data->fields[j]->flags &
@@ -5695,7 +5697,7 @@ static int print_entries(struct seq_file *m,
if (!stats) {
stats = kzalloc_objs(*stats, hist_data->n_vals);
if (!stats) {
- n_entries = -ENOMEM;
+ ret = -ENOMEM;
goto out;
}
}
@@ -5716,7 +5718,7 @@ static int print_entries(struct seq_file *m,
out:
tracing_map_destroy_sort_entries(sort_entries, n_entries);
- return n_entries;
+ return ret;
}
static void hist_trigger_show(struct seq_file *m,
--
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 ` Steven Rostedt [this message]
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 ` [for-linus][PATCH 15/20] tracing: Fix memory corruption from the histogram stacktrace modifier Steven Rostedt
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=20260911181729.830006531@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=sashiko-bot@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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.