summaryrefslogtreecommitdiffstats
path: root/tools/lib
diff options
context:
space:
mode:
authorIan Rogers <irogers@google.com>2021-05-04 16:49:10 -0700
committerAndrii Nakryiko <andrii@kernel.org>2021-05-05 11:29:33 -0700
commit9683e5775c75097c46bd24e65411b16ac6c6cbb3 (patch)
treee217f762417abfa1afc7ff057d3245763dd752d7 /tools/lib
parent1682d8df20aa505f6ab12c76e934b26ede39c529 (diff)
downloadlinux-stable-9683e5775c75097c46bd24e65411b16ac6c6cbb3.tar.gz
linux-stable-9683e5775c75097c46bd24e65411b16ac6c6cbb3.tar.bz2
linux-stable-9683e5775c75097c46bd24e65411b16ac6c6cbb3.zip
libbpf: Add NULL check to add_dummy_ksym_var
Avoids a segv if btf isn't present. Seen on the call path __bpf_object__open calling bpf_object__collect_externs. Fixes: 5bd022ec01f0 (libbpf: Support extern kernel function) Suggested-by: Stanislav Fomichev <sdf@google.com> Suggested-by: Petar Penkov <ppenkov@google.com> Signed-off-by: Ian Rogers <irogers@google.com> Signed-off-by: Andrii Nakryiko <andrii@kernel.org> Link: https://lore.kernel.org/bpf/20210504234910.976501-1-irogers@google.com
Diffstat (limited to 'tools/lib')
-rw-r--r--tools/lib/bpf/libbpf.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/tools/lib/bpf/libbpf.c b/tools/lib/bpf/libbpf.c
index e2a3cf437814..c41d9b2b59ac 100644
--- a/tools/lib/bpf/libbpf.c
+++ b/tools/lib/bpf/libbpf.c
@@ -3216,6 +3216,9 @@ static int add_dummy_ksym_var(struct btf *btf)
const struct btf_var_secinfo *vs;
const struct btf_type *sec;
+ if (!btf)
+ return 0;
+
sec_btf_id = btf__find_by_name_kind(btf, KSYMS_SEC,
BTF_KIND_DATASEC);
if (sec_btf_id < 0)