Commit e93f3999 authored by Yuntao Wang's avatar Yuntao Wang Committed by Andrii Nakryiko
Browse files

libbpf: Don't return -EINVAL if hdr_len < offsetofend(core_relo_len) 



Since core relos is an optional part of the .BTF.ext ELF section, we should
skip parsing it instead of returning -EINVAL if header size is less than
offsetofend(struct btf_ext_header, core_relo_len).

Signed-off-by: default avatarYuntao Wang <ytcoode@gmail.com>
Signed-off-by: default avatarAndrii Nakryiko <andrii@kernel.org>
Link: https://lore.kernel.org/bpf/20220404005320.1723055-1-ytcoode@gmail.com
parent 88d01a57

tools/lib/bpf/btf.c

+2 −4
Original line number Diff line number Diff line
@@ -2826,10 +2826,8 @@ struct btf_ext *btf_ext__new(const __u8 *data, __u32 size) 
	if (err)

		goto done;



	if (btf_ext->hdr->hdr_len < offsetofend(struct btf_ext_header, core_relo_len)) {

		err = -EINVAL;

		goto done;

	}

	if (btf_ext->hdr->hdr_len < offsetofend(struct btf_ext_header, core_relo_len))

		goto done; /* skip core relos parsing */



	err = btf_ext_setup_core_relos(btf_ext);

	if (err)