]> git.ipfire.org Git - thirdparty/kernel/linux.git/commit
bpf: Prefer vmlinux symbols over module symbols for unqualified kprobes
authorAndrey Grodzovsky <andrey.grodzovsky@crowdstrike.com>
Tue, 7 Apr 2026 20:39:11 +0000 (16:39 -0400)
committerAlexei Starovoitov <ast@kernel.org>
Tue, 7 Apr 2026 23:27:52 +0000 (16:27 -0700)
commit1870ddcd94b061f54613b90d6300a350f29fc2f4
tree695a335b8514544f6664a873ae57ccaf2f02ffb0
parenta4985a1755ec9e5aa5cfb89468ba4b51546b5eeb
bpf: Prefer vmlinux symbols over module symbols for unqualified kprobes

When an unqualified kprobe target exists in both vmlinux and a loaded
module, number_of_same_symbols() returns a count greater than 1,
causing kprobe attachment to fail with -EADDRNOTAVAIL even though the
vmlinux symbol is unambiguous.

When no module qualifier is given and the symbol is found in vmlinux,
return the vmlinux-only count without scanning loaded modules. This
preserves the existing behavior for all other cases:
- Symbol only in a module: vmlinux count is 0, falls through to module
  scan as before.
- Symbol qualified with MOD:SYM: mod != NULL, unchanged path.
- Symbol ambiguous within vmlinux itself: count > 1 is returned as-is.

Fixes: 926fe783c8a6 ("tracing/kprobes: Fix symbol counting logic by looking at modules as well")
Fixes: 9d8616034f16 ("tracing/kprobes: Add symbol counting check when module loads")
Suggested-by: Ihor Solodrai <ihor.solodrai@linux.dev>
Acked-by: Jiri Olsa <jolsa@kernel.org>
Acked-by: Ihor Solodrai <ihor.solodrai@linux.dev>
Signed-off-by: Andrey Grodzovsky <andrey.grodzovsky@crowdstrike.com>
Link: https://lore.kernel.org/r/20260407203912.1787502-2-andrey.grodzovsky@crowdstrike.com
Signed-off-by: Alexei Starovoitov <ast@kernel.org>
kernel/trace/trace_kprobe.c