Skip to content

Commit ad6ffac

Browse files
olsajiriAlexei Starovoitov
authored andcommitted
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: stable@vger.kernel.org Fixes: da7e9c0 ("bpf: Add show_fdinfo for kprobe_multi") Signed-off-by: Jiri Olsa <jolsa@kernel.org> Link: https://lore.kernel.org/r/20260225111249.186230-1-jolsa@kernel.org Signed-off-by: Alexei Starovoitov <ast@kernel.org>
1 parent ef06fd1 commit ad6ffac

1 file changed

Lines changed: 3 additions & 1 deletion

File tree

kernel/trace/bpf_trace.c

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2454,8 +2454,10 @@ static void bpf_kprobe_multi_show_fdinfo(const struct bpf_link *link,
24542454
struct seq_file *seq)
24552455
{
24562456
struct bpf_kprobe_multi_link *kmulti_link;
2457+
bool has_cookies;
24572458

24582459
kmulti_link = container_of(link, struct bpf_kprobe_multi_link, link);
2460+
has_cookies = !!kmulti_link->cookies;
24592461

24602462
seq_printf(seq,
24612463
"kprobe_cnt:\t%u\n"
@@ -2467,7 +2469,7 @@ static void bpf_kprobe_multi_show_fdinfo(const struct bpf_link *link,
24672469
for (int i = 0; i < kmulti_link->cnt; i++) {
24682470
seq_printf(seq,
24692471
"%llu\t %pS\n",
2470-
kmulti_link->cookies[i],
2472+
has_cookies ? kmulti_link->cookies[i] : 0,
24712473
(void *)kmulti_link->addrs[i]);
24722474
}
24732475
}

0 commit comments

Comments
 (0)