Skip to contentSkip to conversation

libbpf: fix BTF header parsing checks

PATCH Superseded Andrii Nakryiko 3 participants 3 messages Oct 21, 2021

Subsystems (2)

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore

Andrii Nakryiko

author maintainer
#0 lore raw

PATCH 1/1 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.

Fixes a138aed4a80 ("bpf: btf: Add BTF support to libbpf")
---
 tools/lib/bpf/btf.c | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)
tools/lib/bpf/btf.c +9 -3
index 1ced31ecaf7f..aab7e4ece0a0 100644
@@ -231,13 +231,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
#1 lore raw
Quoted 8 lines · Andrii Nakryiko

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.

Fixes a138aed4a80 ("bpf: btf: Add BTF support to libbpf")

there is no such commit sha.

#2 lore raw
Quoted 8 lines · Alexei Starovoitov
Quoted 6 lines · Andrii Nakryiko

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.

Quoted 4 lines
Quoted 2 lines
Fixes a138aed4a80 ("bpf: btf: Add BTF support to libbpf")

there is no such commit sha.

Oops, seems like I lost the first digit, it should be:

8a138aed4a80 ("bpf: btf: Add BTF support to libbpf")