Skip to contentSkip to conversation

bpf: Fix excessive memory allocation in stack_map_alloc()

PATCH Applied Yuntao Wang 2 participants 2 messages Apr 7, 2022 – Apr 8, 2022

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

PATCH 1/1 bpf: Fix excessive memory allocation in stack_map_alloc()

The 'n_buckets * (value_size + sizeof(struct stack_map_bucket))' part of the allocated memory for 'smap' is never used, get rid of it.

Fixes b936ca643ade ("bpf: rework memlock-based memory accounting for maps")
---
 kernel/bpf/stackmap.c | 1 -
 1 file changed, 1 deletion(-)
kernel/bpf/stackmap.c +0 -1
index 6131b4a19572..1dd5266fbebb 100644
@@ -100,7 +100,6 @@ static struct bpf_map *stack_map_alloc(union bpf_attr *attr)
 		return ERR_PTR(-E2BIG);
 
 	cost = n_buckets * sizeof(struct stack_map_bucket *) + sizeof(*smap);
-	cost += n_buckets * (value_size + sizeof(struct stack_map_bucket));
 	smap = bpf_map_area_alloc(cost, bpf_map_attr_numa_node(attr));
 	if (!smap)
 		return ERR_PTR(-ENOMEM);
Signature · 1 line
2.35.0.rc2
#1 lore raw
This patch was applied to bpf/bpf-next.git (master) by Daniel Borkmann <[email protected]>:

Hello:

This patch was applied to bpf/bpf-next.git (master) by Daniel Borkmann <[email protected]>:

Quoted 8 lines · On Thu, 7 Apr 2022 21:04:23 +0800 you wrote:

The 'n_buckets * (value_size + sizeof(struct stack_map_bucket))' part of the allocated memory for 'smap' is never used, get rid of it.

Fixes b936ca643ade ("bpf: rework memlock-based memory accounting for maps")
---
 kernel/bpf/stackmap.c | 1 -
 1 file changed, 1 deletion(-)

Here is the summary with links:
- [bpf-next] bpf: Fix excessive memory allocation in stack_map_alloc()

    https://git.kernel.org/bpf/bpf-next/c/b45043192b3e

You are awesome, thank you!

Signature · 2 lines
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html