]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
phy: samsung: Use struct_size() in devm_kzalloc()
authorGustavo A. R. Silva <gustavo@embeddedor.com>
Wed, 5 Jun 2019 20:00:02 +0000 (15:00 -0500)
committerKishon Vijay Abraham I <kishon@ti.com>
Thu, 20 Jun 2019 08:43:57 +0000 (14:13 +0530)
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 samsung_usb2_phy_driver {
...
        struct samsung_usb2_phy_instance instances[0];
};

instance = devm_kzalloc(dev, sizeof(struct samsung_usb2_phy_driver) +
count * sizeof(struct samsung_usb2_phy_instance),
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, instances, 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: Kishon Vijay Abraham I <kishon@ti.com>
drivers/phy/samsung/phy-samsung-usb2.c

index ea818866985a5f3e485e457151fea3d16bb69dda..4616ec829900e101391b54d8f131850679981990 100644 (file)
@@ -159,9 +159,8 @@ static int samsung_usb2_phy_probe(struct platform_device *pdev)
        if (!cfg)
                return -EINVAL;
 
-       drv = devm_kzalloc(dev, sizeof(struct samsung_usb2_phy_driver) +
-               cfg->num_phys * sizeof(struct samsung_usb2_phy_instance),
-                                                               GFP_KERNEL);
+       drv = devm_kzalloc(dev, struct_size(drv, instances, cfg->num_phys),
+                          GFP_KERNEL);
        if (!drv)
                return -ENOMEM;