md-linear: use struct_size() in kzalloc()
PATCH 1/1 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.
--- drivers/md/md-linear.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/md/md-linear.c +1 -2
@@ -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 ;
Signature · 1 line
2.20.1
Quoted 12 lines · Gustavo A. R. Silva
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);
Quoted 8 lines
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 <[email protected]>
Quoted 21 lines
--- drivers/md/md-linear.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)drivers/md/md-linear.c +1
-3@@ -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 ; --2.20.1
Hi all,
Friendly ping:
Who can take this?
Thanks
--
Gustavo
Quoted 46 lines · Song Liu
Quoted 12 lines · Gustavo A. R. Silva
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);Quoted 8 lines
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 <[email protected]>Acked-by Song Liu <[email protected]>Quoted 21 lines
--- drivers/md/md-linear.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)drivers/md/md-linear.c +1
-3@@ -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 ; --2.20.1
I will take it, and send pull request.
Thanks,
Song
Quoted 58 lines · Gustavo A. R. Silva
Hi all,
Friendly ping:
Who can take this?
Thanks
--
GustavoQuoted 46 lines · Song Liu
Quoted 12 lines · Gustavo A. R. Silva
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);Quoted 8 lines
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 <[email protected]>Acked-by Song Liu <[email protected]>Quoted 21 lines
--- drivers/md/md-linear.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)drivers/md/md-linear.c +1
-3@@ -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 ; --2.20.1
Quoted 2 lines · Song Liu
I will take it, and send pull request.
Thank you, Song.
--
Gustavo