md-linear: use struct_size() in kzalloc()
authorGustavo A. R. Silva <gustavo@embeddedor.com>
Mon, 7 Jan 2019 17:45:38 +0000 (11:45 -0600)
committerSong Liu <songliubraving@fb.com>
Mon, 4 Feb 2019 18:37:11 +0000 (10:37 -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;
    void *entry[];
};

instance = kzalloc(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 = kzalloc(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: Song Liu <songliubraving@fb.com>
drivers/md/md-linear.c

index d45c697c0ebe7cede53a25618e30a4398390202f..5998d78aa1892414bbe3e4f558c306a4dfda43e2 100644 (file)
@@ -96,8 +96,7 @@ static struct linear_conf *linear_conf(struct mddev *mddev, int raid_disks)
        int i, cnt;
        bool discard_supported = false;
 
-       conf = kzalloc (sizeof (*conf) + raid_disks*sizeof(struct dev_info),
-                       GFP_KERNEL);
+       conf = kzalloc(struct_size(conf, disks, raid_disks), GFP_KERNEL);
        if (!conf)
                return NULL;