Commit 4c01925f authored by Andrii Nakryiko's avatar Andrii Nakryiko Committed by Alexei Starovoitov
Browse files

libbpf: Enforce 64-bitness of BTF for BPF object files 



BPF object files are always targeting 64-bit BPF target architecture, so
enforce that at BTF level as well.

Signed-off-by: default avatarAndrii Nakryiko <andriin@fb.com>
Signed-off-by: default avatarAlexei Starovoitov <ast@kernel.org>
Link: https://lore.kernel.org/bpf/20200813204945.1020225-7-andriin@fb.com
parent eed7818a

tools/lib/bpf/libbpf.c

+4 −0
Original line number Diff line number Diff line
@@ -2434,6 +2434,8 @@ static int bpf_object__init_btf(struct bpf_object *obj, 
				BTF_ELF_SEC, err);

			goto out;

		}

		/* enforce 8-byte pointers for BPF-targeted BTFs */

		btf__set_pointer_size(obj->btf, 8);

		err = 0;

	}

	if (btf_ext_data) {
@@ -2542,6 +2544,8 @@ static int bpf_object__sanitize_and_load_btf(struct bpf_object *obj) 
		if (IS_ERR(kern_btf))

			return PTR_ERR(kern_btf);



		/* enforce 8-byte pointers for BPF-targeted BTFs */

		btf__set_pointer_size(obj->btf, 8);

		bpf_object__sanitize_btf(obj, kern_btf);

	}