Commit ad6fface authored by Jiri Olsa's avatar Jiri Olsa Committed by Alexei Starovoitov
Browse files

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: da7e9c0a ("bpf: Add show_fdinfo for kprobe_multi")
Signed-off-by: default avatarJiri Olsa <jolsa@kernel.org>
Link: https://lore.kernel.org/r/20260225111249.186230-1-jolsa@kernel.org


Signed-off-by: default avatarAlexei Starovoitov <ast@kernel.org>
parent ef06fd16

kernel/trace/bpf_trace.c

+3 −1
Original line number Diff line number Diff line
@@ -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]);

	}

}