net: hns: use struct_size() in devm_kzalloc()
authorGustavo A. R. Silva <gustavo@embeddedor.com>
Tue, 26 Feb 2019 00:27:57 +0000 (18:27 -0600)
committerDavid S. Miller <davem@davemloft.net>
Thu, 28 Feb 2019 05:47:42 +0000 (21:47 -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 = devm_kzalloc(dev, sizeof(struct foo) + sizeof(struct boo) * count, GFP_KERNEL);

Instead of leaving these open-coded and prone to type mistakes, we can
now use the new struct_size() helper:

instance = devm_kzalloc(dev, 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/hisilicon/hns/hns_dsaf_ppe.c

index 0942e4916d9d0d1b0b78958481ea099e66e59639..3d07c8a7639dad46c5b810b19f56ba84fdfc655a 100644 (file)
@@ -83,8 +83,9 @@ static int hns_ppe_common_get_cfg(struct dsaf_device *dsaf_dev, int comm_index)
        else
                ppe_num = HNS_PPE_DEBUG_NW_ENGINE_NUM;
 
-       ppe_common = devm_kzalloc(dsaf_dev->dev, sizeof(*ppe_common) +
-               ppe_num * sizeof(struct hns_ppe_cb), GFP_KERNEL);
+       ppe_common = devm_kzalloc(dsaf_dev->dev,
+                                 struct_size(ppe_common, ppe_cb, ppe_num),
+                                 GFP_KERNEL);
        if (!ppe_common)
                return -ENOMEM;