rjmcmahon
/
umber-kernel
1
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

kallsyms/ftrace: set module buildid in ftrace_mod_address_lookup() 

[ Upstream commit e8a1e7eaa19d0b757b06a2f913e3eeb4b1c002c6 ]

__sprint_symbol() might access an invalid pointer when
kallsyms_lookup_buildid() returns a symbol found by
ftrace_mod_address_lookup().

The ftrace lookup function must set both @modname and @modbuildid the same
way as module_address_lookup().

Link: https://lkml.kernel.org/r/20251128135920.217303-7-pmladek@suse.com
Fixes: 9294523e37 ("module: add printk formats to add module build ID to stacktraces")
Signed-off-by: Petr Mladek <pmladek@suse.com>
Reviewed-by: Aaron Tomlin <atomlin@atomlin.com>
Acked-by: Steven Rostedt (Google) <rostedt@goodmis.org>
Cc: Alexei Starovoitov <ast@kernel.org>
Cc: Daniel Borkman <daniel@iogearbox.net>
Cc: Daniel Gomez <da.gomez@samsung.com>
Cc: John Fastabend <john.fastabend@gmail.com>
Cc: Kees Cook <kees@kernel.org>
Cc: Luis Chamberalin <mcgrof@kernel.org>
Cc: Marc Rutland <mark.rutland@arm.com>
Cc: "Masami Hiramatsu (Google)" <mhiramat@kernel.org>
Cc: Petr Pavlu <petr.pavlu@suse.com>
Cc: Sami Tolvanen <samitolvanen@google.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Petr Mladek 2025-11-28 14:59:19 +01:00 committed by Greg Kroah-Hartman
parent 7f4827b247
commit feef0143ec
3 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/linux/ftrace.h
View File

@ -87,11 +87,13 @@ struct ftrace_hash;
defined(CONFIG_DYNAMIC_FTRACE) defined(CONFIG_DYNAMIC_FTRACE)
int int
ftrace_mod_address_lookup(unsigned long addr, unsigned long *size, ftrace_mod_address_lookup(unsigned long addr, unsigned long *size,
unsigned long *off, char **modname, char *sym); unsigned long *off, char **modname,
const unsigned char **modbuildid, char *sym);
#else #else
static inline int static inline int
ftrace_mod_address_lookup(unsigned long addr, unsigned long *size, ftrace_mod_address_lookup(unsigned long addr, unsigned long *size,
unsigned long *off, char **modname, char *sym) unsigned long *off, char **modname,
const unsigned char **modbuildid, char *sym)
{ {
return 0; return 0;
} }

4
kernel/kallsyms.c
View File

@ -380,8 +380,8 @@ static int kallsyms_lookup_buildid(unsigned long addr,
ret = bpf_address_lookup(addr, symbolsize, offset, namebuf); ret = bpf_address_lookup(addr, symbolsize, offset, namebuf);
if (!ret) if (!ret)
ret = ftrace_mod_address_lookup(addr, symbolsize, ret = ftrace_mod_address_lookup(addr, symbolsize, offset,
offset, modname, namebuf); modname, modbuildid, namebuf);
return ret; return ret;
} }

5
kernel/trace/ftrace.c
View File

@ -7709,7 +7709,8 @@ ftrace_func_address_lookup(struct ftrace_mod_map *mod_map,
int int
ftrace_mod_address_lookup(unsigned long addr, unsigned long *size, ftrace_mod_address_lookup(unsigned long addr, unsigned long *size,
unsigned long *off, char **modname, char *sym) unsigned long *off, char **modname,
const unsigned char **modbuildid, char *sym)
{ {
struct ftrace_mod_map *mod_map; struct ftrace_mod_map *mod_map;
int ret = 0; int ret = 0;
@ -7721,6 +7722,8 @@ ftrace_mod_address_lookup(unsigned long addr, unsigned long *size,
if (ret) { if (ret) {
if (modname) if (modname)
*modname = mod_map->mod->name; *modname = mod_map->mod->name;
if (modbuildid)
*modbuildid = module_buildid(mod_map->mod);
break; break;
} }
} }