sparc: use struct_size() in kzalloc()
PATCH 1/1 sparc: 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.
--- arch/sparc/kernel/cpumap.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
arch/sparc/kernel/cpumap.c +1 -2
@@ -194,8 +194,7 @@ static struct cpuinfo_tree *build_cpuinfo_tree(void) n =enumerate_cpuinfo_nodes (tmp_level); - new_tree =kzalloc (sizeof (struct cpuinfo_tree ) + - (sizeof (struct cpuinfo_node ) * n),GFP_ATOMIC ); + new_tree =kzalloc (struct_size (new_tree, nodes, n),GFP_ATOMIC );if (!new_tree)return NULL ;
Signature · 1 line
2.20.1
From: "Gustavo A. R. Silva" <[email protected]>
Date: Tue, 8 Jan 2019 10:13:56 -0600
Quoted 11 lines
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]>
Applied.
Hi Dave,
I wonder if you 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]>--- arch/sparc/kernel/cpumap.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)arch/sparc/kernel/cpumap.c +1
-2@@ -194,8 +194,7 @@ static struct cpuinfo_tree *build_cpuinfo_tree(void) n =enumerate_cpuinfo_nodes (tmp_level); - new_tree =kzalloc (sizeof (struct cpuinfo_tree ) + - (sizeof (struct cpuinfo_node ) * n),GFP_ATOMIC ); + new_tree =kzalloc (struct_size (new_tree, nodes, n),GFP_ATOMIC );if (!new_tree)return NULL ;