libbpf: fix overflow in BTF sanity checks
PATCH 1/1 libbpf: fix overflow in BTF sanity checks
From: Andrii Nakryiko <[email protected]>
btf_header's str_off+str_len or type_off+type_len can overflow as they are u32s. This will lead to bypassing the sanity checks during BTF parsing, resulting in crashes afterwards. Fix by using 64-bit signed integers for comparison.
Fixes d8123624506c ("libbpf: Fix BTF data layout checks and allow empty BTF")
Reported-by Evgeny Vereshchagin <[email protected]>
Signed-off-by Andrii Nakryiko <[email protected]>
--- tools/lib/bpf/btf.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
tools/lib/bpf/btf.c +2 -2
@@ -241,12 +241,12 @@ static int btf_parse_hdr(struct btf *btf) } meta_left = btf->raw_size -sizeof (*hdr); -if (meta_left < hdr->str_off + hdr->str_len) { +if (meta_left < (long long )hdr->str_off + hdr->str_len) {pr_debug ("Invalid BTF total size:%u\n" , btf->raw_size);return -EINVAL ; } -if (hdr->type_off + hdr->type_len > hdr->str_off) { +if ((long long )hdr->type_off + hdr->type_len > hdr->str_off) {pr_debug ("Invalid BTF data sections layout: type data at %u + %u, strings data at %u + %u\n" , hdr->type_off, hdr->type_len, hdr->str_off, hdr->str_len);return -EINVAL ;
Signature · 1 line
2.30.2
Alexei Starovoitov
AppliedQuoted 11 lines · On Tue, Oct 19, 2021 at 9:58 AM <[email protected]> wrote:
From: Andrii Nakryiko <[email protected]>
btf_header's str_off+str_len or type_off+type_len can overflow as they are u32s. This will lead to bypassing the sanity checks during BTF parsing, resulting in crashes afterwards. Fix by using 64-bit signed integers for comparison.
Fixes d8123624506c ("libbpf: Fix BTF data layout checks and allow empty BTF")Reported-by Evgeny Vereshchagin <[email protected]>Signed-off-by Andrii Nakryiko <[email protected]>
Applied.