summaryrefslogtreecommitdiff
path: root/tools/bpf/bpftool/prog.c
diff options
context:
space:
mode:
authorPeter Zijlstra <peterz@infradead.org>2024-12-20 17:31:19 +0300
committerPeter Zijlstra <peterz@infradead.org>2024-12-20 17:31:19 +0300
commitc2db11a750fb626d0d04f2dc76e548a1f07617df (patch)
tree01c899b2a06855633ae991f2064242f976987809 /tools/bpf/bpftool/prog.c
parent63a48181fbcddefe5fb4c6618938bb64c543945b (diff)
parent4a077914578183ec397ad09f7156a357e00e5d72 (diff)
downloadlinux-c2db11a750fb626d0d04f2dc76e548a1f07617df.tar.xz
Merge branch 'locking/urgent'
Sync with urgent -- avoid conflicts. Signed-off-by: Peter Zijlstra <peterz@infradead.org>
Diffstat (limited to 'tools/bpf/bpftool/prog.c')
-rw-r--r--tools/bpf/bpftool/prog.c17
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];