diff options
| author | Eduard Zingerman <[email protected]> | 2025-07-18 22:20:59 +0000 |
|---|---|---|
| committer | Andrii Nakryiko <[email protected]> | 2025-07-19 00:12:50 +0000 |
| commit | 42be23e8f2dcb100cb9944b2b54b6bf41aff943d (patch) | |
| tree | 7c53180214088b4c4f362b3fbff8ce7117fc0d8b /tools/lib/bpf/libbpf.c | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf after rc6 (diff) | |
| download | kernel-42be23e8f2dcb100cb9944b2b54b6bf41aff943d.tar.gz kernel-42be23e8f2dcb100cb9944b2b54b6bf41aff943d.zip | |
libbpf: Verify that arena map exists when adding arena relocations
Fuzzer reported a memory access error in bpf_program__record_reloc()
that happens when:
- ".addr_space.1" section exists
- there is a relocation referencing this section
- there are no arena maps defined in BTF.
Sanity checks for maps existence are already present in
bpf_program__record_reloc(), hence this commit adds another one.
[1] https://github.com/libbpf/libbpf/actions/runs/16375110681/job/46272998064
Signed-off-by: Eduard Zingerman <[email protected]>
Signed-off-by: Andrii Nakryiko <[email protected]>
Link: https://lore.kernel.org/bpf/[email protected]
Diffstat (limited to 'tools/lib/bpf/libbpf.c')
| -rw-r--r-- | tools/lib/bpf/libbpf.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/tools/lib/bpf/libbpf.c b/tools/lib/bpf/libbpf.c index 162ebd16a59f..e067cb5776bd 100644 --- a/tools/lib/bpf/libbpf.c +++ b/tools/lib/bpf/libbpf.c @@ -4582,6 +4582,11 @@ static int bpf_program__record_reloc(struct bpf_program *prog, /* arena data relocation */ if (shdr_idx == obj->efile.arena_data_shndx) { + if (obj->arena_map_idx < 0) { + pr_warn("prog '%s': bad arena data relocation at insn %u, no arena maps defined\n", + prog->name, insn_idx); + return -LIBBPF_ERRNO__RELOC; + } reloc_desc->type = RELO_DATA; reloc_desc->insn_idx = insn_idx; reloc_desc->map_idx = obj->arena_map_idx; |