diff options
| author | Andrii Nakryiko <andriin@fb.com> | 2019-11-06 18:08:54 -0800 |
|---|---|---|
| committer | Daniel Borkmann <daniel@iogearbox.net> | 2019-11-07 16:20:38 +0100 |
| commit | 994021a7e08477f7e51285920aac99fc967fae8a (patch) | |
| tree | b60c21f9c262698672f83d22dc89a66c98425d2b /tools | |
| parent | dd3ab126379ec040b3edab8559f9c72de6ef9d29 (diff) | |
libbpf: Make btf__resolve_size logic always check size error condition
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
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/lib/bpf/btf.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/tools/lib/bpf/btf.c b/tools/lib/bpf/btf.c index d72e9a79dce1..86a1847e4a9f 100644 --- 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; |