diff options
| author | Amir Mohammadi <amirmohammadi1999.am@gmail.com> | 2024-11-21 09:34:13 +0100 |
|---|---|---|
| committer | Alexei Starovoitov <ast@kernel.org> | 2024-11-25 23:28:46 +0100 |
| commit | ef3ba8c258ee368a5343fa9329df85b4bcb9e8b5 (patch) | |
| tree | 57c8aa57034107f62be938877fee81152085a197 /tools/bpf | |
| parent | xsk: always clear DMA mapping information when unmapping the pool (diff) | |
| download | linux-ef3ba8c258ee368a5343fa9329df85b4bcb9e8b5.tar.xz linux-ef3ba8c258ee368a5343fa9329df85b4bcb9e8b5.zip | |
bpftool: fix potential NULL pointer dereferencing in prog_dump()
A NULL pointer dereference could occur if ksyms
is not properly checked before usage in the prog_dump() function.
Fixes: b053b439b72a ("bpf: libbpf: bpftool: Print bpf_line_info during prog dump")
Signed-off-by: Amir Mohammadi <amiremohamadi@yahoo.com>
Reviewed-by: Quentin Monnet <qmo@kernel.org>
Acked-by: John Fastabend <john.fastabend@gmail.com>
Link: https://lore.kernel.org/r/20241121083413.7214-1-amiremohamadi@yahoo.com
Signed-off-by: Alexei Starovoitov <ast@kernel.org>
Diffstat (limited to 'tools/bpf')
| -rw-r--r-- | tools/bpf/bpftool/prog.c | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/tools/bpf/bpftool/prog.c b/tools/bpf/bpftool/prog.c index 2ff949ea82fa..e71be67f1d86 100644 --- a/tools/bpf/bpftool/prog.c +++ b/tools/bpf/bpftool/prog.c @@ -822,11 +822,18 @@ prog_dump(struct bpf_prog_info *info, enum dump_mode mode, printf("%s:\n", sym_name); } - if (disasm_print_insn(img, lens[i], opcodes, - name, disasm_opt, btf, - prog_linfo, ksyms[i], i, - linum)) - goto exit_free; + if (ksyms) { + if (disasm_print_insn(img, lens[i], opcodes, + name, disasm_opt, btf, + prog_linfo, ksyms[i], i, + linum)) + goto exit_free; + } else { + if (disasm_print_insn(img, lens[i], opcodes, + name, disasm_opt, btf, + NULL, 0, 0, false)) + goto exit_free; + } img += lens[i]; |