libbpf: ignore STT_SECTION symbols in 'maps' section
PATCH 1/1 libbpf: ignore STT_SECTION symbols in 'maps' section
When parsing legacy map definitions, libbpf would error out when encountering an STT_SECTION symbol. This becomes a problem because some versions of binutils will produce SECTION symbols for every section when processing an ELF file, so BPF files run through 'strip' will end up with such symbols, making libbpf refuse to load them.
There's not really any reason why erroring out is strictly necessary, so change libbpf to just ignore SECTION symbols when parsing the ELF.
--- tools/lib/bpf/libbpf.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
tools/lib/bpf/libbpf.c +3 -2
@@ -1869,6 +1869,8 @@ static int bpf_object__init_user_maps(struct bpf_object *obj, bool strict)continue ;if (sym.st_shndx != obj->efile.maps_shndx)continue ; +if (GELF_ST_TYPE (sym.st_info) ==STT_SECTION ) +continue ; map =bpf_object__add_map (obj);if (IS_ERR (map))
@@ -1881,8 +1883,7 @@ static int bpf_object__init_user_maps(struct bpf_object *obj, bool strict)return -LIBBPF_ERRNO__FORMAT ; } -if (GELF_ST_TYPE (sym.st_info) ==STT_SECTION - ||GELF_ST_BIND (sym.st_info) ==STB_LOCAL ) { +if (GELF_ST_BIND (sym.st_info) ==STB_LOCAL ) {pr_warn ("map '%s' (legacy): static maps are not supported\n" , map_name);return -ENOTSUP ; }
Signature · 1 line
2.33.0
Andrii Nakryiko
AppliedQuoted 7 lines · Toke Høiland-Jørgensen
When parsing legacy map definitions, libbpf would error out when encountering an
STT_SECTIONsymbol. This becomes a problem because some versions of binutils will produce SECTION symbols for every section when processing an ELF file, so BPF files run through 'strip' will end up with such symbols, making libbpf refuse to load them.
Quoted 6 lines
There's not really any reason why erroring out is strictly necessary, so change libbpf to just ignore SECTION symbols when parsing the ELF.
Cc Jiri Benc <[email protected]>Signed-off-by Toke Høiland-Jørgensen <[email protected]>---
Applied to bpf-next, thanks.
[...]