From: Greg Kroah-Hartman Date: Sat, 30 Dec 2023 11:37:39 +0000 (+0000) Subject: drop queue-6.1/tracing-kprobes-fix-symbol-counting-logic-by-looking-at-modules-as... X-Git-Tag: v6.1.70~6 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=3d948a7cadfd7dccd59e8c70fbdfe27ea4310dd0;p=thirdparty%2Fkernel%2Fstable-queue.git drop queue-6.1/tracing-kprobes-fix-symbol-counting-logic-by-looking-at-modules-as-well.patch --- diff --git a/queue-6.1/series b/queue-6.1/series index 9a246a05c3b..3c1199da309 100644 --- a/queue-6.1/series +++ b/queue-6.1/series @@ -108,4 +108,3 @@ kvm-arm64-vgic-force-vcpu-vgic-teardown-on-vcpu-destroy.patch x86-alternatives-sync-core-before-enabling-interrupts.patch mm-damon-core-make-damon_start-waits-until-kdamond_fn-starts.patch fuse-share-lookup-state-between-submount-and-its-parent.patch -tracing-kprobes-fix-symbol-counting-logic-by-looking-at-modules-as-well.patch diff --git a/queue-6.1/tracing-kprobes-fix-symbol-counting-logic-by-looking-at-modules-as-well.patch b/queue-6.1/tracing-kprobes-fix-symbol-counting-logic-by-looking-at-modules-as-well.patch deleted file mode 100644 index f9bf6392831..00000000000 --- a/queue-6.1/tracing-kprobes-fix-symbol-counting-logic-by-looking-at-modules-as-well.patch +++ /dev/null @@ -1,68 +0,0 @@ -From 926fe783c8a64b33997fec405cf1af3e61aed441 Mon Sep 17 00:00:00 2001 -From: Andrii Nakryiko -Date: Fri, 27 Oct 2023 16:31:26 -0700 -Subject: tracing/kprobes: Fix symbol counting logic by looking at modules as well - -From: Andrii Nakryiko - -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@kernel.org/ - -Cc: Francis Laniel -Cc: stable@vger.kernel.org -Cc: Masami Hiramatsu -Cc: Steven Rostedt -Fixes: b022f0c7e404 ("tracing/kprobes: Return EADDRNOTAVAIL when func matches several symbols") -Signed-off-by: Andrii Nakryiko -Acked-by: Song Liu -Signed-off-by: Masami Hiramatsu (Google) -Signed-off-by: Greg Kroah-Hartman ---- - kernel/trace/trace_kprobe.c | 24 ++++++++++++++++++++---- - 1 file changed, 20 insertions(+), 4 deletions(-) - ---- a/kernel/trace/trace_kprobe.c -+++ b/kernel/trace/trace_kprobe.c -@@ -714,14 +714,30 @@ static int count_symbols(void *data, uns - return 0; - } - -+struct sym_count_ctx { -+ unsigned int count; -+ const char *name; -+}; -+ -+static int count_mod_symbols(void *data, const char *name, unsigned long unused) -+{ -+ struct sym_count_ctx *ctx = data; -+ -+ if (strcmp(name, ctx->name) == 0) -+ ctx->count++; -+ -+ return 0; -+} -+ - static unsigned int number_of_same_symbols(char *func_name) - { -- unsigned int count; -+ struct sym_count_ctx ctx = { .count = 0, .name = func_name }; -+ -+ kallsyms_on_each_match_symbol(count_symbols, func_name, &ctx.count); - -- count = 0; -- kallsyms_on_each_match_symbol(count_symbols, func_name, &count); -+ module_kallsyms_on_each_symbol(NULL, count_mod_symbols, &ctx); - -- return count; -+ return ctx.count; - } - - static int __trace_kprobe_create(int argc, const char *argv[])