diff options
| author | Gustavo A. R. Silva <gustavo@embeddedor.com> | 2019-01-08 09:52:44 -0600 |
|---|---|---|
| committer | Boris Brezillon <bbrezillon@kernel.org> | 2019-01-15 20:49:31 +0100 |
| commit | 04b4c06caf2b810f0ce4822f6611ed35326ca11a (patch) | |
| tree | 1c253be8681376f142cdc4c0b9a954f699338346 /drivers/mtd/chips | |
| parent | 9cb76a6aa1a9524866ec1558f08d044506b707fa (diff) | |
| download | linux-04b4c06caf2b810f0ce4822f6611ed35326ca11a.tar.gz linux-04b4c06caf2b810f0ce4822f6611ed35326ca11a.tar.bz2 linux-04b4c06caf2b810f0ce4822f6611ed35326ca11a.zip | |
mtd: cfi: cmdset_0001: Use struct_size() in kmalloc()
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 = kmalloc(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 = kmalloc(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: Boris Brezillon <bbrezillon@kernel.org>
Diffstat (limited to 'drivers/mtd/chips')
| -rw-r--r-- | drivers/mtd/chips/cfi_cmdset_0001.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/mtd/chips/cfi_cmdset_0001.c b/drivers/mtd/chips/cfi_cmdset_0001.c index 6e8e7b1bb34b..79a53cb8507b 100644 --- a/drivers/mtd/chips/cfi_cmdset_0001.c +++ b/drivers/mtd/chips/cfi_cmdset_0001.c @@ -756,7 +756,8 @@ static int cfi_intelext_partition_fixup(struct mtd_info *mtd, } numvirtchips = cfi->numchips * numparts; - newcfi = kmalloc(sizeof(struct cfi_private) + numvirtchips * sizeof(struct flchip), GFP_KERNEL); + newcfi = kmalloc(struct_size(newcfi, chips, numvirtchips), + GFP_KERNEL); if (!newcfi) return -ENOMEM; shared = kmalloc_array(cfi->numchips, |