tracing: Only return an adjusted address if it matches the kernel address

The trace_adjust_address() will take a given address and examine the
persistent ring buffer to see if the address matches a module that is
listed there. If it does not, it will just adjust the value to the core
kernel delta. But if the address was for something that was not part of
the core kernel text or data it should not be adjusted.

Check the result of the adjustment and only return the adjustment if it
lands in the current kernel text or data. If not, return the original
address.

Cc: Masami Hiramatsu <mhiramat@kernel.org>
Cc: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Link: https://lore.kernel.org/20250506102300.0ba2f9e0@gandalf.local.home
Signed-off-by: Steven Rostedt (Google) <rostedt@goodmis.org>

diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c
index 5b8db27fb6ef37482c386c409caf0ec81e55028f..01572ef79802f79cbd90c0a2c9e1aed1b326ecdb 100644 (file)
--- a/kernel/trace/trace.c
+++ b/kernel/trace/trace.c
@@ -6032,6 +6032,7 @@ unsigned long trace_adjust_address(struct trace_array *tr, unsigned long addr)
        struct trace_module_delta *module_delta;
        struct trace_scratch *tscratch;
        struct trace_mod_entry *entry;
+       unsigned long raddr;
        int idx = 0, nr_entries;
 
        /* If we don't have last boot delta, return the address */
@@ -6045,7 +6046,9 @@ unsigned long trace_adjust_address(struct trace_array *tr, unsigned long addr)
        module_delta = READ_ONCE(tr->module_delta);
        if (!module_delta || !tscratch->nr_entries ||
            tscratch->entries[0].mod_addr > addr) {
-               return addr + tr->text_delta;
+               raddr = addr + tr->text_delta;
+               return __is_kernel(raddr) || is_kernel_core_data(raddr) ||
+                       is_kernel_rodata(raddr) ? raddr : addr;
        }
 
        /* Note that entries must be sorted. */