OSDN Git Service

cxgb4/l2t: Use struct_size() in kvzalloc()
authorGustavo A. R. Silva <gustavo@embeddedor.com>
Tue, 15 Jan 2019 21:44:52 +0000 (15:44 -0600)
committerDavid S. Miller <davem@davemloft.net>
Thu, 17 Jan 2019 05:11:09 +0000 (21:11 -0800)
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 = kvzalloc(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 = kvzalloc(struct_size(instance, entry, count), GFP_KERNEL);

This code was detected with the help of Coccinelle.

Signed-off-by: Gustavo A. R. Silva <gustavo@embeddedor.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/ethernet/chelsio/cxgb4/l2t.c

index 4852feb..1a407d3 100644 (file)
@@ -646,7 +646,7 @@ struct l2t_data *t4_init_l2t(unsigned int l2t_start, unsigned int l2t_end)
        if (l2t_size < L2T_MIN_HASH_BUCKETS)
                return NULL;
 
-       d = kvzalloc(sizeof(*d) + l2t_size * sizeof(struct l2t_entry), GFP_KERNEL);
+       d = kvzalloc(struct_size(d, l2tab, l2t_size), GFP_KERNEL);
        if (!d)
                return NULL;