openvswitch: meter: Use struct_size() in kzalloc()
Subsystems (3)
PATCH 1/1 openvswitch: meter: Use struct_size() in kzalloc()
One of the more common cases of allocation size calculations is finding the size of a structure that has a zero-sized array at the end, along with memory for some number of elements for that array. For example:
struct foo {
int stuff;
struct boo entry[];
};instance = kzalloc(sizeof(struct foo) + count * sizeof(struct boo), GFP_KERNEL);
Instead of leaving these open-coded and prone to type mistakes, we can now use the new struct_size() helper:
instance = kzalloc(struct_size(instance, entry, count), GFP_KERNEL);
This code was detected with the help of Coccinelle.
--- net/openvswitch/meter.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
net/openvswitch/meter.c +1 -2
@@ -206,8 +206,7 @@ static struct dp_meter *dp_meter_create(struct nlattr **a)return ERR_PTR (-EINVAL );/* Allocate and set up the meter before locking anything. */ - meter =kzalloc (n_bands *sizeof (struct dp_meter_band ) + -sizeof (*meter),GFP_KERNEL ); + meter =kzalloc (struct_size (meter, bands, n_bands),GFP_KERNEL );if (!meter)return ERR_PTR (-ENOMEM );
Signature · 1 line
2.20.1
From: "Gustavo A. R. Silva" <[email protected]>
Date: Tue, 15 Jan 2019 15:19:17 -0600
Quoted 11 lines
One of the more common cases of allocation size calculations is finding the size of a structure that has a zero-sized array at the end, along with memory for some number of elements for that array. For example:
struct foo { int stuff; struct boo entry[]; };instance =
kzalloc(sizeof(struct foo) + count * sizeof(struct boo), GFP_KERNEL);
Quoted 8 lines
Instead of leaving these open-coded and prone to type mistakes, we can now use the new
struct_size()helper:instance =
kzalloc(struct_size(instance, entry, count), GFP_KERNEL);This code was detected with the help of Coccinelle.
Signed-off-by Gustavo A. R. Silva <[email protected]>
Applied.