Commit c5c3899d authored by Gustavo A. R. Silva's avatar Gustavo A. R. Silva Committed by David S. Miller

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.
Signed-off-by: default avatarGustavo A. R. Silva <gustavo@embeddedor.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 3fcb3f9b
...@@ -206,8 +206,7 @@ static struct dp_meter *dp_meter_create(struct nlattr **a) ...@@ -206,8 +206,7 @@ static struct dp_meter *dp_meter_create(struct nlattr **a)
return ERR_PTR(-EINVAL); return ERR_PTR(-EINVAL);
/* Allocate and set up the meter before locking anything. */ /* Allocate and set up the meter before locking anything. */
meter = kzalloc(n_bands * sizeof(struct dp_meter_band) + meter = kzalloc(struct_size(meter, bands, n_bands), GFP_KERNEL);
sizeof(*meter), GFP_KERNEL);
if (!meter) if (!meter)
return ERR_PTR(-ENOMEM); return ERR_PTR(-ENOMEM);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment