]> git.ipfire.org Git - thirdparty/kernel/stable.git/commit
bpftool: Fix error check when calling hashmap__new()
authorMauricio Vásquez <mauricio@kinvolk.io>
Fri, 7 Jan 2022 15:26:20 +0000 (10:26 -0500)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 8 Apr 2022 12:05:57 +0000 (14:05 +0200)
commit861bccf3bb9fd6479f3d8ed23017b214d944cdd9
tree4b42274c0b221469021e7537ee821c73386a6b14
parentf86631de2ed85809bbcc755f4a732c35160eea35
bpftool: Fix error check when calling hashmap__new()

[ Upstream commit 622a5b582cc27d3deedc38fcef68da2972e8e58d ]

hashmap__new() encodes errors with ERR_PTR(), hence it's not valid to
check the returned pointer against NULL and IS_ERR() has to be used
instead.

libbpf_get_error() can't be used in this case as hashmap__new() is not
part of the public libbpf API and it'll continue using ERR_PTR() after
libbpf 1.0.

Fixes: 8f184732b60b ("bpftool: Switch to libbpf's hashmap for pinned paths of BPF objects")
Fixes: 2828d0d75b73 ("bpftool: Switch to libbpf's hashmap for programs/maps in BTF listing")
Fixes: d6699f8e0f83 ("bpftool: Switch to libbpf's hashmap for PIDs/names references")
Signed-off-by: Mauricio Vásquez <mauricio@kinvolk.io>
Signed-off-by: Andrii Nakryiko <andrii@kernel.org>
Reviewed-by: Quentin Monnet <quentin@isovalent.com>
Acked-by: Song Liu <songliubraving@fb.com>
Link: https://lore.kernel.org/bpf/20220107152620.192327-2-mauricio@kinvolk.io
Signed-off-by: Sasha Levin <sashal@kernel.org>
tools/bpf/bpftool/btf.c
tools/bpf/bpftool/link.c
tools/bpf/bpftool/map.c
tools/bpf/bpftool/pids.c
tools/bpf/bpftool/prog.c