Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

tracing/kprobes: Fix symbol counting logic by looking at modules as well

Recent changes to count number of matching symbols when creating
a kprobe event failed to take into account kernel modules. As such, it
breaks kprobes on kernel module symbols, by assuming there is no match.

Fix this my calling module_kallsyms_on_each_symbol() in addition to
kallsyms_on_each_match_symbol() to perform a proper counting.

Link: https://lore.kernel.org/all/20231027233126.2073148-1-andrii@kernel.org/

Cc: Francis Laniel <flaniel@linux.microsoft.com>
Cc: stable@vger.kernel.org
Cc: Masami Hiramatsu <mhiramat@kernel.org>
Cc: Steven Rostedt <rostedt@goodmis.org>
Fixes: b022f0c7e404 ("tracing/kprobes: Return EADDRNOTAVAIL when func matches several symbols")
Signed-off-by: Andrii Nakryiko <andrii@kernel.org>
Acked-by: Song Liu <song@kernel.org>
Signed-off-by: Masami Hiramatsu (Google) <mhiramat@kernel.org>

authored by

Andrii Nakryiko and committed by
Masami Hiramatsu (Google)
926fe783 e0f83183

+20 -4
+20 -4
kernel/trace/trace_kprobe.c
··· 714 714 return 0; 715 715 } 716 716 717 + struct sym_count_ctx { 718 + unsigned int count; 719 + const char *name; 720 + }; 721 + 722 + static int count_mod_symbols(void *data, const char *name, unsigned long unused) 723 + { 724 + struct sym_count_ctx *ctx = data; 725 + 726 + if (strcmp(name, ctx->name) == 0) 727 + ctx->count++; 728 + 729 + return 0; 730 + } 731 + 717 732 static unsigned int number_of_same_symbols(char *func_name) 718 733 { 719 - unsigned int count; 734 + struct sym_count_ctx ctx = { .count = 0, .name = func_name }; 720 735 721 - count = 0; 722 - kallsyms_on_each_match_symbol(count_symbols, func_name, &count); 736 + kallsyms_on_each_match_symbol(count_symbols, func_name, &ctx.count); 723 737 724 - return count; 738 + module_kallsyms_on_each_symbol(NULL, count_mod_symbols, &ctx); 739 + 740 + return ctx.count; 725 741 } 726 742 727 743 static int __trace_kprobe_create(int argc, const char *argv[])