]> git.baikalelectronics.ru Git - kernel.git/commitdiff
mtd: rawnand: jz4780: use struct_size() in devm_kzalloc()
authorGustavo A. R. Silva <gustavo@embeddedor.com>
Thu, 23 Aug 2018 19:33:32 +0000 (14:33 -0500)
committerMiquel Raynal <miquel.raynal@bootlin.com>
Tue, 4 Sep 2018 21:44:25 +0000 (23:44 +0200)
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;
        void *entry[];
};

instance = devm_kzalloc(dev, sizeof(struct foo) + sizeof(void *) * 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);

Signed-off-by: Gustavo A. R. Silva <gustavo@embeddedor.com>
Reviewed-by: Boris Brezillon <boris.brezillon@bootlin.com>
Reviewed-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com>
drivers/mtd/nand/raw/jz4780_nand.c

index db4fa60bd52acaf5f056e27dcec2803431ad5414..ac6239588f2621988d9b06316f78fbc3e5b8beaf 100644 (file)
@@ -352,7 +352,7 @@ static int jz4780_nand_probe(struct platform_device *pdev)
                return -ENODEV;
        }
 
-       nfc = devm_kzalloc(dev, sizeof(*nfc) + (sizeof(nfc->cs[0]) * num_banks), GFP_KERNEL);
+       nfc = devm_kzalloc(dev, struct_size(nfc, cs, num_banks), GFP_KERNEL);
        if (!nfc)
                return -ENOMEM;