Skip to contentSkip to conversation

bpf: Fix kprobe_multi cookies access in show_fdinfo callback

PATCH Applied Jiri Olsa 2 participants 2 messages Feb 25 – Feb 26

Subsystems (5)
Stable branch BPF Tracing BPF tracing +1 more subsystems
lore
Share & tools
lore

Jiri Olsa

author reviewer
#0 lore raw

PATCH 1/1 bpf: Fix kprobe_multi cookies access in show_fdinfo callback

We don't check if cookies are available on the kprobe_multi link before accessing them in show_fdinfo callback, we should.

Cc [email protected]
Fixes da7e9c0a7fbc ("bpf: Add show_fdinfo for kprobe_multi")
Signed-off-by Jiri Olsa <[email protected]>
---
 kernel/trace/bpf_trace.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
kernel/trace/bpf_trace.c +3 -1
index 9bc0dfd235af..0b040a417442 100644
@@ -2454,8 +2454,10 @@ static void bpf_kprobe_multi_show_fdinfo(const struct bpf_link *link,
 					 struct seq_file *seq)
 {
 	struct bpf_kprobe_multi_link *kmulti_link;
+	bool has_cookies;
 
 	kmulti_link = container_of(link, struct bpf_kprobe_multi_link, link);
+	has_cookies = !!kmulti_link->cookies;
 
 	seq_printf(seq,
 		   "kprobe_cnt:\t%u\n"

@@ -2467,7 +2469,7 @@ static void bpf_kprobe_multi_show_fdinfo(const struct bpf_link *link,
 	for (int i = 0; i < kmulti_link->cnt; i++) {
 		seq_printf(seq,
 			   "%llu\t %pS\n",
-			   kmulti_link->cookies[i],
+			   has_cookies ? kmulti_link->cookies[i] : 0,
 			   (void *)kmulti_link->addrs[i]);
 	}
 }
Signature · 1 line
2.53.0
CI Applied
#1 lore raw
This patch was applied to bpf/bpf.git (master) by Alexei Starovoitov <[email protected]>:

Hello:

This patch was applied to bpf/bpf.git (master)
by Alexei Starovoitov <[email protected]>:

Quoted 8 lines · On Wed, 25 Feb 2026 12:12:49 +0100 you wrote:

We don't check if cookies are available on the kprobe_multi link before accessing them in show_fdinfo callback, we should.

Cc [email protected]
Fixes da7e9c0a7fbc ("bpf: Add show_fdinfo for kprobe_multi")
Signed-off-by Jiri Olsa <[email protected]>

[...]

Here is the summary with links:
- [bpf] bpf: Fix kprobe_multi cookies access in show_fdinfo callback

    https://git.kernel.org/bpf/bpf/c/ad6fface76da

You are awesome, thank you!

Signature · 2 lines
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html