aboutsummaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorAndrii Nakryiko2021-03-19 13:59:08 -0700
committerAlexei Starovoitov2021-03-22 18:58:25 -0700
commit78b226d48106fc91628f941c66545f05273269df (patch)
tree52e4f693d2c4941ce8d004b8b92c063b295eb64a /tools
parent9ef05281e5d01dffdf75a4ae5c1aee7cbd7aaa73 (diff)
libbpf: Skip BTF fixup if object file has no BTF
Skip BTF fixup step when input object file is missing BTF altogether. Fixes: 8fd27bf69b86 ("libbpf: Add BPF static linker BTF and BTF.ext support") Reported-by: Jiri Olsa <jolsa@redhat.com> Signed-off-by: Andrii Nakryiko <andrii@kernel.org> Signed-off-by: Alexei Starovoitov <ast@kernel.org> Tested-by: Jiri Olsa <jolsa@redhat.com> Link: https://lore.kernel.org/bpf/20210319205909.1748642-3-andrii@kernel.org
Diffstat (limited to 'tools')
-rw-r--r--tools/lib/bpf/linker.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/tools/lib/bpf/linker.c b/tools/lib/bpf/linker.c
index b4fff912dce2..5e0aa2f2c0ca 100644
--- a/tools/lib/bpf/linker.c
+++ b/tools/lib/bpf/linker.c
@@ -1313,6 +1313,9 @@ static int linker_fixup_btf(struct src_obj *obj)
struct src_sec *sec;
int i, j, n, m;
+ if (!obj->btf)
+ return 0;
+
n = btf__get_nr_types(obj->btf);
for (i = 1; i <= n; i++) {
struct btf_var_secinfo *vi;