libbpf: Prevent null-pointer dereference when prog to load has no BTF
PATCH v2 1/1 libbpf: Prevent null-pointer dereference when prog to load has no BTF
From: Quentin Monnet <[email protected]>
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().
---
v1 was: 'Revert "libbpf: make uniform use of btf__fd() accessor inside libbpf"'
--- tools/lib/bpf/libbpf.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-)
tools/lib/bpf/libbpf.c +3 -4
@@ -7317,9 +7317,9 @@ static int bpf_object_load_prog(struct bpf_object *obj, struct bpf_program *progchar *cp, errmsg[STRERR_BUFSIZE ];size_t log_buf_size =0 ;char *log_buf =NULL , *tmp; -int btf_fd, ret, err;bool own_log_buf = true;__u32 log_level = prog->log_level; +int ret, err;if (prog->type ==BPF_PROG_TYPE_UNSPEC ) {/*
@@ -7343,9 +7343,8 @@ static int bpf_object_load_prog(struct bpf_object *obj, struct bpf_program *prog load_attr.prog_ifindex = prog->prog_ifindex;/* specify func_info/line_info only if kernel supports them */ - btf_fd =btf__fd (obj->btf); -if (btf_fd >=0 &&kernel_supports (obj,FEAT_BTF_FUNC )) { - load_attr.prog_btf_fd = btf_fd; +if (obj->btf &&btf__fd (obj->btf) >=0 &&kernel_supports (obj,FEAT_BTF_FUNC )) { + load_attr.prog_btf_fd =btf__fd (obj->btf); load_attr.func_info = prog->func_info; load_attr.func_info_rec_size = prog->func_info_rec_size; load_attr.func_info_cnt = prog->func_info_cnt;
Signature · 1 line
2.34.1
This patch was applied to bpf/bpf-next.git (master) by Andrii Nakryiko <[email protected]>:
Hello:
This patch was applied to bpf/bpf-next.git (master) by Andrii Nakryiko <[email protected]>:
Quoted 9 lines · On Thu, 14 Mar 2024 15:04:38 +0000 you wrote:
From: Quentin Monnet <[email protected]>
In
bpf_objec_load_prog(), there's no guarantee thatobj->btfis non-NULL when passing it tobtf__fd(), and this function does not perform any check before dereferencing its argument (asbpf_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.[...]
Here is the summary with links:
- [bpf-next,v2] libbpf: Prevent null-pointer dereference when prog to load has no BTF
https://git.kernel.org/bpf/bpf-next/c/9bf48fa19a4b
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html