projects
/
linux-2.6-microblaze.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
548f119
)
bpf: Check for integer overflow when using roundup_pow_of_two()
author
Bui Quang Minh
<minhquangbui99@gmail.com>
Wed, 27 Jan 2021 06:36:53 +0000
(06:36 +0000)
committer
Daniel Borkmann
<daniel@iogearbox.net>
Wed, 3 Feb 2021 20:45:33 +0000
(21:45 +0100)
On 32-bit architecture, roundup_pow_of_two() can return 0 when the argument
has upper most bit set due to resulting 1UL << 32. Add a check for this case.
Fixes:
d5a3b1f69186
("bpf: introduce BPF_MAP_TYPE_STACK_TRACE")
Signed-off-by: Bui Quang Minh <minhquangbui99@gmail.com>
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
Link:
https://lore.kernel.org/bpf/20210127063653.3576-1-minhquangbui99@gmail.com
kernel/bpf/stackmap.c
patch
|
blob
|
history
diff --git
a/kernel/bpf/stackmap.c
b/kernel/bpf/stackmap.c
index
aea96b6
..
bfafbf1
100644
(file)
--- a/
kernel/bpf/stackmap.c
+++ b/
kernel/bpf/stackmap.c
@@
-115,6
+115,8
@@
static struct bpf_map *stack_map_alloc(union bpf_attr *attr)
/* hash table size must be power of 2 */
n_buckets = roundup_pow_of_two(attr->max_entries);
+ if (!n_buckets)
+ return ERR_PTR(-E2BIG);
cost = n_buckets * sizeof(struct stack_map_bucket *) + sizeof(*smap);
cost += n_buckets * (value_size + sizeof(struct stack_map_bucket));