Commit 3415ec64 authored Aug 01, 2019 by Andrii Nakryiko Committed by Alexei Starovoitov Aug 01, 2019

libbpf: set BTF FD for prog only when there is supported .BTF.ext data



5d01ab7b ("libbpf: fix erroneous multi-closing of BTF FD")
introduced backwards-compatibility issue, manifesting itself as -E2BIG
error returned on program load due to unknown non-zero btf_fd attribute
value for BPF_PROG_LOAD sys_bpf() sub-command.

This patch fixes bug by ensuring that we only ever associate BTF FD with
program if there is a BTF.ext data that was successfully loaded into
kernel, which automatically means kernel supports func_info/line_info
and associated BTF FD for progs (checked and ensured also by BTF
sanitization code).

Fixes: 5d01ab7b ("libbpf: fix erroneous multi-closing of BTF FD")
Reported-by: Andrey Ignatov <rdna@fb.com>
Signed-off-by: Andrii Nakryiko <andriin@fb.com>
Signed-off-by: Alexei Starovoitov <ast@kernel.org>

parent 56fbc241

tools/lib/bpf/libbpf.c

+5 −1

Original line number	Diff line number	Diff line
		@@ -2472,7 +2472,11 @@ load_program(struct bpf_program prog, struct bpf_insn insns, int insns_cnt,
		load_attr.license = license;
		load_attr.kern_version = kern_version;
		load_attr.prog_ifindex = prog->prog_ifindex;
		/* if .BTF.ext was loaded, kernel supports associated BTF for prog */
		if (prog->obj->btf_ext)
		btf_fd = bpf_object__btf_fd(prog->obj);
		else
		btf_fd = -1;
		load_attr.prog_btf_fd = btf_fd >= 0 ? btf_fd : 0;
		load_attr.func_info = prog->func_info;
		load_attr.func_info_rec_size = prog->func_info_rec_size;

Admin message