dm-switch: use struct_size() in kzalloc()
PATCH 1/1 dm-switch: 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/dm-switch.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/md/dm-switch.c +1 -2
@@ -61,8 +61,7 @@ static struct switch_ctx *alloc_switch_ctx(struct dm_target *ti, unsigned nr_pat {struct switch_ctx *sctx; - sctx =kzalloc (sizeof (struct switch_ctx ) + nr_paths *sizeof (struct switch_path ), -GFP_KERNEL ); + sctx =kzalloc (struct_size (sctx, path_list, nr_paths),GFP_KERNEL );if (!sctx)return NULL ;
Signature · 1 line
2.20.1
Hi all,
Friendly ping:
Who can take this?
Thanks
--
Gustavo
Quoted 38 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);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]>--- drivers/md/dm-switch.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)drivers/md/dm-switch.c +1
-2@@ -61,8 +61,7 @@ static struct switch_ctx *alloc_switch_ctx(struct dm_target *ti, unsigned nr_pat {struct switch_ctx *sctx; - sctx =kzalloc (sizeof (struct switch_ctx ) + nr_paths *sizeof (struct switch_path ), -GFP_KERNEL ); + sctx =kzalloc (struct_size (sctx, path_list, nr_paths),GFP_KERNEL );if (!sctx)return NULL ;
Quoted 5 lines · Gustavo A. R. Silva
Hi all,
Friendly ping:
Who can take this?
I've picked it up for 5.1:
https://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm.git/commit/?h=dm-5.1&id=042f96ad4c5a369307df2a840fd943a4b080c3d1
Thanks,
Mike
Quoted 12 lines · Mike Snitzer
Quoted 5 lines · Gustavo A. R. Silva
Hi all,
Friendly ping:
Who can take this?
I've picked it up for 5.1:
https://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm.git/commit/?h=dm-5.1&id=042f96ad4c5a369307df2a840fd943a4b080c3d1
Great. :)
Thank you, Mike.
--
Gustavo