libbpf: fix overflow in BTF sanity checks
Andrii Nakryiko
maintainerPATCH v3 1/2 libbpf: fix overflow in BTF sanity checks
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
Andrii Nakryiko
maintainerPATCH v3 2/2 libbpf: fix BTF header parsing checks
Original code assumed fixed and correct BTF header length. That's not always the case, though, so fix this bug with a proper additional check. And use actual header length instead of sizeof(struct btf_header) in sanity checks.
Reported-by Evgeny Vereshchagin <[email protected]>
Fixes 8a138aed4a80 ("bpf: btf: Add BTF support to libbpf")
Signed-off-by Andrii Nakryiko <[email protected]>
--- tools/lib/bpf/btf.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-)
tools/lib/bpf/btf.c +9 -3
@@ -236,13 +236,19 @@ static int btf_parse_hdr(struct btf *btf) }btf_bswap_hdr (hdr); }else if (hdr->magic !=BTF_MAGIC ) { -pr_debug ("Invalid BTF magic:%x\n" , hdr->magic); +pr_debug ("Invalid BTF magic: %x\n" , hdr->magic);return -EINVAL ; } - meta_left = btf->raw_size -sizeof (*hdr); +if (btf->raw_size < hdr->hdr_len) { +pr_debug ("BTF header len %u larger than data size %u\n" , + hdr->hdr_len, btf->raw_size); +return -EINVAL ; + } + + meta_left = btf->raw_size - hdr->hdr_len;if (meta_left < (long long )hdr->str_off + hdr->str_len) { -pr_debug ("Invalid BTF total size:%u\n" , btf->raw_size); +pr_debug ("Invalid BTF total size: %u\n" , btf->raw_size);return -EINVAL ; }
Signature · 1 line
2.30.2