Skip to contentSkip to conversation

bpf: Use struct_size() in kzalloc()

PATCH In review Gustavo A. R. Silva 2 participants 2 messages May 13, 2021 1 message not in the archive

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

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.

---
 net/core/bpf_sk_storage.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
net/core/bpf_sk_storage.c +1 -2
index cc3712ad8716..f564f82e91d9 100644
@@ -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

A message that is not in the archive (sent off-list or not yet received): 162094681128.5074.13510794749219416919.git-patchwork-notify@kernel.org