This is a note to let you know that I've just added the patch titled
tracing/kprobes: Fix symbol counting logic by looking at modules as well
to the 5.15-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
tracing-kprobes-fix-symbol-counting-logic-by-looking-at-modules-as-well.patch
and it can be found in the queue-5.15 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From stable+bounces-10541-greg=kroah.com@xxxxxxxxxxxxxxx Thu Jan 11 22:53:55 2024
From: Markus Boehme <markubo@xxxxxxxxxx>
Date: Thu, 11 Jan 2024 22:43:54 +0100
Subject: tracing/kprobes: Fix symbol counting logic by looking at modules as well
To: stable@xxxxxxxxxxxxxxx
Cc: Andrii Nakryiko <andrii@xxxxxxxxxx>, Francis Laniel <flaniel@xxxxxxxxxxxxxxxxxxx>, Masami Hiramatsu <mhiramat@xxxxxxxxxx>, Steven Rostedt <rostedt@xxxxxxxxxxx>, Song Liu <song@xxxxxxxxxx>, Markus Boehme <markubo@xxxxxxxxxx>
Message-ID: <20240111214354.369299-3-markubo@xxxxxxxxxx>
From: Andrii Nakryiko <andrii@xxxxxxxxxx>
commit 926fe783c8a64b33997fec405cf1af3e61aed441 upstream.
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@xxxxxxxxxx/
Cc: Francis Laniel <flaniel@xxxxxxxxxxxxxxxxxxx>
Cc: stable@xxxxxxxxxxxxxxx
Cc: Masami Hiramatsu <mhiramat@xxxxxxxxxx>
Cc: Steven Rostedt <rostedt@xxxxxxxxxxx>
Fixes: b022f0c7e404 ("tracing/kprobes: Return EADDRNOTAVAIL when func matches several symbols")
Signed-off-by: Andrii Nakryiko <andrii@xxxxxxxxxx>
Acked-by: Song Liu <song@xxxxxxxxxx>
Signed-off-by: Masami Hiramatsu (Google) <mhiramat@xxxxxxxxxx>
Signed-off-by: Markus Boehme <markubo@xxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
kernel/trace/trace_kprobe.c | 2 ++
1 file changed, 2 insertions(+)
--- a/kernel/trace/trace_kprobe.c
+++ b/kernel/trace/trace_kprobe.c
@@ -735,6 +735,8 @@ static unsigned int number_of_same_symbo
kallsyms_on_each_symbol(count_symbols, &args);
+ module_kallsyms_on_each_symbol(count_symbols, &args);
+
return args.count;
}
Patches currently in stable-queue which might be from kroah.com@xxxxxxxxxxxxxxx are
queue-5.15/kallsyms-make-module_kallsyms_on_each_symbol-generally-available.patch
queue-5.15/tracing-kprobes-fix-symbol-counting-logic-by-looking-at-modules-as-well.patch
