bpf: Use struct_size() in kzalloc()
Subsystems (3)
PATCH 1/1 bpf: Use struct_size() in kzalloc()
Make use of the struct_size() helper instead of an open-coded version, in order to avoid any potential type mistakes or integer overflows that, in the worst scenario, could lead to heap overflows.
This code was detected with the help of Coccinelle and, audited and fixed manually.
Signed-off-by Gustavo A. R. Silva <[email protected]>
--- net/core/bpf_sk_storage.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
net/core/bpf_sk_storage.c +1 -2
@@ -524,8 +524,7 @@ bpf_sk_storage_diag_alloc(const struct nlattr *nla_stgs) nr_maps++; } - diag =kzalloc (sizeof (*diag) +sizeof (diag->maps[0 ]) * nr_maps, -GFP_KERNEL ); + diag =kzalloc (struct_size (diag, maps, nr_maps),GFP_KERNEL );if (!diag)return ERR_PTR (-ENOMEM );
Signature · 1 line
2.27.0
Quoted 3 lines · On 5/13/21 18:00, [email protected] wrote:
Hello:
This patch was applied to netdev/net-next.git (refs/heads/master):
[..]
Quoted 3 lines
Here is the summary with links:
- [next] bpf: Usestruct_size()inkzalloc()
https://git.kernel.org/netdev/net-next/c/fe0bdaec8dea
Awesome. :)
Thanks, Dave.
--
Gustavo