bianbu-repo-mirror/bianbu-linux-6.6
1
0
Fork 0
mirror of https://gitee.com/bianbu-linux/linux-6.6 synced 2025-04-24 14:07:52 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

libbpf: Fix signedness bug in btf_dump_array_data()

Browse source 
The btf__resolve_size() function returns negative error codes so
"elem_size" must be signed for the error handling to work.

Fixes: 920d16af9b ("libbpf: BTF dumper support for typed data")
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
Acked-by: Yonghong Song <yhs@fb.com>
Link: https://lore.kernel.org/bpf/20220208071552.GB10495@kili
This commit is contained in:
Dan Carpenter 2022-02-08 10:15:52 +03:00 • committed by Daniel Borkmann
parent 5912fcb4be
commit 4172843ed4
1 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
tools/lib/bpf/btf_dump.c
View file

@ -1861,14 +1861,15 @@ static int btf_dump_array_data(struct btf_dump *d,
{ {
const struct btf_array *array = btf_array(t); const struct btf_array *array = btf_array(t);
const struct btf_type *elem_type; const struct btf_type *elem_type;
__u32 i, elem_size = 0, elem_type_id; __u32 i, elem_type_id;
__s64 elem_size;
bool is_array_member; bool is_array_member;
elem_type_id = array->type; elem_type_id = array->type;
elem_type = skip_mods_and_typedefs(d->btf, elem_type_id, NULL); elem_type = skip_mods_and_typedefs(d->btf, elem_type_id, NULL);
elem_size = btf__resolve_size(d->btf, elem_type_id); elem_size = btf__resolve_size(d->btf, elem_type_id);
if (elem_size <= 0) { if (elem_size <= 0) {
pr_warn("unexpected elem size %d for array type [%u]\n", elem_size, id); pr_warn("unexpected elem size %lld for array type [%u]\n", elem_size, id);
return -EINVAL; return -EINVAL;
} }