From: Haoran Wang <haoranwangsec@gmail.com>
To: rostedt@goodmis.org, mhiramat@kernel.org
Cc: linux-kernel@vger.kernel.org, linux-trace-kernel@vger.kernel.org,
mathieu.desnoyers@efficios.com, haoranwangsec@gmail.com
Subject: [PATCH] tracing: reject trace events with an empty TP_STRUCT__entry
Date: Fri, 16 Oct 2026 15:38:49 +0800 [thread overview]
Message-ID: <6ad1d48d.a461c41f.282b8.7a97@mx.google.com> (raw)
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Haoran Wang <haoranwangsec@gmail.com>
Date: Fri, 16 Oct 2026 15:10:00 +0800
Subject: [PATCH] tracing: reject trace events with an empty TP_STRUCT__entry
trace_event_get_offsets() unconditionally dereferences the first entry of
an event class's fields list through list_first_entry(). A tracepoint
that declares an empty TP_STRUCT__entry never populates that list. Its
fields_array holds only the terminating sentinel, so list_first_entry()
returns the list head itself and the following tail->offset + tail->size
reads memory past struct trace_event_class. The corrupted result is
then used as the BPF context-size bound in __perf_event_set_bpf_prog(),
which lets context-reading BPF programs attach to a zero-field tracepoint
when they should be rejected with -EACCES.
Reject such events at registration can fix this bug. event_init() is the
universal chokepoint invoked for both early-boot and module events, and
its return is enforced by __register_event(), which refuses to add the call
to ftrace_events. An event whose fields_array[0].type is NULL (the
empty-TP_STRUCT__entry sentinel) is rejected with -EINVAL before
trace_event_get_offsets() can be reached. Dynamic events, which carry
the TRACE_FUNCTION_TYPE marker in fields_array[0].type and populate the
fields list lazily through a define_fields callback, are unaffected.
Signed-off-by: Haoran Wang <haoranwangsec@gmail.com>
---
kernel/trace/trace_events.c | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/kernel/trace/trace_events.c b/kernel/trace/trace_events.c
--- a/kernel/trace/trace_events.c
+++ b/kernel/trace/trace_events.c
@@ -3279,6 +3279,11 @@ static int event_init(struct trace_event_call *call)
if (WARN_ON(!name))
return -EINVAL;
+ if (call->class->fields_array &&
+ !call->class->fields_array[0].type &&
+ !call->class->get_fields)
+ return -EINVAL;
+
if (call->class->raw_init) {
ret = call->class->raw_init(call);
if (ret < 0 && ret != -ENOSYS)
--
2.43.0
next reply other threads:[~2026-10-16 7:38 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-10-16 7:38 Haoran Wang [this message]
-- strict thread matches above, loose matches on Subject: below --
2026-10-16 6:57 Haoran Wang
2026-10-16 14:13 ` 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=6ad1d48d.a461c41f.282b8.7a97@mx.google.com \
--to=haoranwangsec@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-trace-kernel@vger.kernel.org \
--cc=mathieu.desnoyers@efficios.com \
--cc=mhiramat@kernel.org \
--cc=rostedt@goodmis.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®