OSDN Git Service

cxgb4: clip_tbl: Use struct_size() in kvzalloc()
authorGustavo A. R. Silva <gustavo@embeddedor.com>
Tue, 29 Jan 2019 16:44:44 +0000 (10:44 -0600)
committerDavid S. Miller <davem@davemloft.net>
Tue, 29 Jan 2019 18:55:02 +0000 (10:55 -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/clip_tbl.c

index 5701272..ce28820 100644 (file)
@@ -289,8 +289,7 @@ struct clip_tbl *t4_init_clip_tbl(unsigned int clipt_start,
        if (clipt_size < CLIPT_MIN_HASH_BUCKETS)
                return NULL;
 
-       ctbl = kvzalloc(sizeof(*ctbl) +
-                           clipt_size*sizeof(struct list_head), GFP_KERNEL);
+       ctbl = kvzalloc(struct_size(ctbl, hash_list, clipt_size), GFP_KERNEL);
        if (!ctbl)
                return NULL;