projects
/
platform
/
kernel
/
linux-rpi.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
5a3c8e0
)
libbpf: Make btf__resolve_size logic always check size error condition
author
Andrii Nakryiko
<andriin@fb.com>
Thu, 7 Nov 2019 02:08:54 +0000
(18:08 -0800)
committer
Greg Kroah-Hartman
<gregkh@linuxfoundation.org>
Sun, 26 Jan 2020 09:00:58 +0000
(10:00 +0100)
commit
994021a7e08477f7e51285920aac99fc967fae8a
upstream.
Perform size check always in btf__resolve_size. Makes the logic a bit more
robust against corrupted BTF and silences LGTM/Coverity complaining about
always true (size < 0) check.
Fixes:
69eaab04c675
("btf: extract BTF type size calculation")
Signed-off-by: Andrii Nakryiko <andriin@fb.com>
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
Link:
https://lore.kernel.org/bpf/20191107020855.3834758-5-andriin@fb.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
tools/lib/bpf/btf.c
patch
|
blob
|
history
diff --git
a/tools/lib/bpf/btf.c
b/tools/lib/bpf/btf.c
index
1aa189a
..
d606a35
100644
(file)
--- a/
tools/lib/bpf/btf.c
+++ b/
tools/lib/bpf/btf.c
@@
-269,10
+269,9
@@
__s64 btf__resolve_size(const struct btf *btf, __u32 type_id)
t = btf__type_by_id(btf, type_id);
}
+done:
if (size < 0)
return -EINVAL;
-
-done:
if (nelems && size > UINT32_MAX / nelems)
return -E2BIG;