[PATCH] bpf: Check for integer overflow when using roundup_pow_of_two()

Subsystems: bpf [general] (safe dynamic programs and tools), bpf [tracing], the rest

STALE2015d LANDED

Landed in mainline as 6183f4d3a0a2 on 2021-02-03.

2 messages, 2 authors, 2021-02-03 · open the first message on its own page

[PATCH] bpf: Check for integer overflow when using roundup_pow_of_two()

From: Bui Quang Minh <hidden>
Date: 2021-01-27 06:44:41

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: d5a3b1f ("bpf: introduce BPF_MAP_TYPE_STACK_TRACE")
Signed-off-by: Bui Quang Minh <redacted>
---
 kernel/bpf/stackmap.c | 2 ++
 1 file changed, 2 insertions(+)
diff --git a/kernel/bpf/stackmap.c b/kernel/bpf/stackmap.c
index aea96b638473..bfafbf115bf3 100644
--- 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));
-- 
2.17.1

Re: [PATCH] bpf: Check for integer overflow when using roundup_pow_of_two()

From: patchwork-bot+netdevbpf@kernel.org
Date: 2021-02-03 20:51:52

Hello:

This patch was applied to bpf/bpf.git (refs/heads/master):

On Wed, 27 Jan 2021 06:36:53 +0000 you wrote:
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: d5a3b1f ("bpf: introduce BPF_MAP_TYPE_STACK_TRACE")
Signed-off-by: Bui Quang Minh <redacted>

[...]
Here is the summary with links:
  - bpf: Check for integer overflow when using roundup_pow_of_two()
    https://git.kernel.org/bpf/bpf/c/6183f4d3a0a2

You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html

Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help