libbpf: Prevent null-pointer dereference when prog to load has no BTF
authorQuentin Monnet <qmo@kernel.org>
Thu, 14 Mar 2024 15:04:38 +0000 (15:04 +0000)
committerAndrii Nakryiko <andrii@kernel.org>
Thu, 14 Mar 2024 20:41:17 +0000 (13:41 -0700)
commit9bf48fa19a4b1d186e08b20bf7e5de26a15644fb
tree1fcbb6ba740bcc479893149a2ad3f1dc2f83db8d
parentfe879bb42f8a6513ed18e9d22efb99cb35590201
libbpf: Prevent null-pointer dereference when prog to load has no BTF

In bpf_objec_load_prog(), there's no guarantee that obj->btf is non-NULL
when passing it to btf__fd(), and this function does not perform any
check before dereferencing its argument (as bpf_object__btf_fd() used to
do). As a consequence, we get segmentation fault errors in bpftool (for
example) when trying to load programs that come without BTF information.

v2: Keep btf__fd() in the fix instead of reverting to bpf_object__btf_fd().

Fixes: df7c3f7d3a3d ("libbpf: make uniform use of btf__fd() accessor inside libbpf")
Suggested-by: Andrii Nakryiko <andrii@kernel.org>
Signed-off-by: Quentin Monnet <qmo@kernel.org>
Signed-off-by: Andrii Nakryiko <andrii@kernel.org>
Link: https://lore.kernel.org/bpf/20240314150438.232462-1-qmo@kernel.org
tools/lib/bpf/libbpf.c