Skip to contentSkip to conversation

bpf: Check for integer overflow when using roundup_pow_of_two()

PATCH Applied Bui Quang Minh 2 participants 2 messages Jan 27, 2021 – Feb 3, 2021

Subsystems (4)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 bpf: Check for integer overflow when using roundup_pow_of_two()

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")
---
 kernel/bpf/stackmap.c | 2 ++
 1 file changed, 2 insertions(+)
kernel/bpf/stackmap.c +2 -0
index aea96b638473..bfafbf115bf3 100644
@@ -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));
Signature · 1 line
2.17.1
#1 lore raw
This patch was applied to bpf/bpf.git (refs/heads/master):

Hello:

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

Quoted 8 lines · 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")

[...]

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