Revert "libbpf: make uniform use of btf__fd() accessor inside libbpf"
PATCH 1/1 Revert "libbpf: make uniform use of btf__fd() accessor inside libbpf"
This reverts commit df7c3f7d3a3ddab31ca8cfa9b86a8729ec43fd2e.
There's no guarantee that obj->btf is non-NULL when passing it to btf__fd(), and this function doesn't perform any check before dereferencing its argument. As a consequence, this commit caused segmentation faults in bpftool (for example) when trying to load programs that come without BTF info.
--- tools/lib/bpf/libbpf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
tools/lib/bpf/libbpf.c +1 -1
@@ -7343,7 +7343,7 @@ 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); + btf_fd =bpf_object__btf_fd (obj);if (btf_fd >=0 &&kernel_supports (obj,FEAT_BTF_FUNC )) { load_attr.prog_btf_fd = btf_fd; load_attr.func_info = prog->func_info;
Signature · 1 line
2.34.1
Quoted 19 lines · Quentin Monnet
This reverts commit
df7c3f7d3a3ddab31ca8cfa9b86a8729ec43fd2e.There's no guarantee that
obj->btfis non-NULL when passing it tobtf__fd(), and this function doesn't perform any check before dereferencing its argument. As a consequence, this commit caused segmentation faults in bpftool (for example) when trying to load programs that come without BTF info.Signed-off-by Quentin Monnet <[email protected]>--- tools/lib/bpf/libbpf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)tools/lib/bpf/libbpf.c +0
-0
tools/lib/bpf/libbpf.c static int bpf_object_load_prog(struct bpf_object *obj, struct bpf_program *prog · line 7346
Quoted 5 lines
tools/lib/bpf/libbpf.c +1
-1@@ -7343,7 +7343,7 @@ 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); + btf_fd =bpf_object__btf_fd (obj);
oh, my bad, sorry about that. But I'd still like to stick to using btf__fd(), so maybe let's fix forward by dropping btf_fd variable here and doing what bpf_object__create_map() does:
if (obj->btf && btf__fd(obj->btf) >= 0 && kernel_supports(...)) {
load_attr.prog_btf_fd = btf__fd(obj->btf);
...
}?
Quoted 6 lines
tools/lib/bpf/libbpf.c +0
-1if (btf_fd >=0 &&kernel_supports (obj,FEAT_BTF_FUNC )) { load_attr.prog_btf_fd = btf_fd; load_attr.func_info = prog->func_info; --2.34.1
Quoted 30 lines · Andrii Nakryiko
Quoted 19 lines · Quentin Monnet
This reverts commit
df7c3f7d3a3ddab31ca8cfa9b86a8729ec43fd2e.There's no guarantee that
obj->btfis non-NULL when passing it tobtf__fd(), and this function doesn't perform any check before dereferencing its argument. As a consequence, this commit caused segmentation faults in bpftool (for example) when trying to load programs that come without BTF info.Signed-off-by Quentin Monnet <[email protected]>--- tools/lib/bpf/libbpf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)tools/lib/bpf/libbpf.c +0
-0tools/lib/bpf/libbpf.c static int bpf_object_load_prog(struct bpf_object *obj, struct bpf_program *prog · line 7346
Quoted 5 lines
tools/lib/bpf/libbpf.c +1
-1@@ -7343,7 +7343,7 @@ 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); + btf_fd =bpf_object__btf_fd (obj);oh, my bad, sorry about that. But I'd still like to stick to using
btf__fd(), so maybe let's fix forward by droppingbtf_fdvariable here and doing whatbpf_object__create_map()does:
Quoted 6 lines
if (obj->btf && btf__fd(obj->btf) >= 0 && kernel_supports(...)) { load_attr.prog_btf_fd = btf__fd(obj->btf); ... }?
I half-expected that :). I don't mind at all, I'll send an updated version tomorrow. Thanks!