From: Toke Høiland-Jørgensen Date: Wed, 29 Sep 2021 21:38:37 +0000 (+0200) Subject: libbpf: Properly ignore STT_SECTION symbols in legacy map definitions X-Git-Tag: block-5.16-2021-11-13~96^2~303^2~14 X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=161ecd537948a7003129889b04a3a0858687bc70;p=linux-2.6-block.git libbpf: Properly ignore STT_SECTION symbols in legacy map definitions The previous patch to ignore STT_SECTION symbols only added the ignore condition in one of them. This fails if there's more than one map definition in the 'maps' section, because the subsequent modulus check will fail, resulting in error messages like: libbpf: elf: unable to determine legacy map definition size in ./xdpdump_xdp.o Fix this by also ignoring STT_SECTION in the first loop. Fixes: c3e8c44a9063 ("libbpf: Ignore STT_SECTION symbols in 'maps' section") Signed-off-by: Toke Høiland-Jørgensen Signed-off-by: Andrii Nakryiko Link: https://lore.kernel.org/bpf/20210929213837.832449-1-toke@redhat.com --- diff --git a/tools/lib/bpf/libbpf.c b/tools/lib/bpf/libbpf.c index 1c859b32968d..7544d7d09160 100644 --- a/tools/lib/bpf/libbpf.c +++ b/tools/lib/bpf/libbpf.c @@ -1868,6 +1868,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; nr_maps++; } /* Assume equally sized map definitions */