summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorGustavo A. R. Silva <gustavoars@kernel.org>2021-05-13 16:50:49 -0500
committerDavid S. Miller <davem@davemloft.net>2021-05-13 15:58:00 -0700
commitfe0bdaec8dea9912b95296d758422d95aa57fac0 (patch)
tree67e78272b1ed4b6938eba366d7d1a308840891b0 /net
parent0f3ee280331e28b81560715356d47351a6016bce (diff)
downloadlinux-fe0bdaec8dea9912b95296d758422d95aa57fac0.tar.gz
linux-fe0bdaec8dea9912b95296d758422d95aa57fac0.tar.bz2
linux-fe0bdaec8dea9912b95296d758422d95aa57fac0.zip
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 <gustavoars@kernel.org> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
-rw-r--r--net/core/bpf_sk_storage.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/net/core/bpf_sk_storage.c b/net/core/bpf_sk_storage.c
index cc3712ad8716..f564f82e91d9 100644
--- a/net/core/bpf_sk_storage.c
+++ b/net/core/bpf_sk_storage.c
@@ -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);