From: Gustavo A. R. Silva Date: Mon, 7 Jan 2019 17:45:38 +0000 (-0600) Subject: md-linear: use struct_size() in kzalloc() X-Git-Tag: v5.15~6749^2~98^2~1 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=f1e5b6239bdd46aa3f4e631611800ea7d10826c4;p=platform%2Fkernel%2Flinux-starfive.git md-linear: use struct_size() in kzalloc() 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 Signed-off-by: Song Liu --- diff --git a/drivers/md/md-linear.c b/drivers/md/md-linear.c index d45c697..5998d78 100644 --- a/drivers/md/md-linear.c +++ b/drivers/md/md-linear.c @@ -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;