IB/usnic: Use struct_size() in kmalloc()
Subsystems (2)
PATCH 1/1 IB/usnic: Use struct_size() in kmalloc()
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 = kmalloc(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 = kmalloc(struct_size(instance, entry, count), GFP_KERNEL);
This code was detected with the help of Coccinelle.
--- drivers/infiniband/hw/usnic/usnic_uiom.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
drivers/infiniband/hw/usnic/usnic_uiom.c +2 -3
@@ -157,9 +157,8 @@ static int usnic_uiom_get_pages(unsigned long addr, size_t size, int writable, off =0 ;while (ret) { - chunk =kmalloc (sizeof (*chunk) + -sizeof (struct scatterlist ) * -min_t (int, ret,USNIC_UIOM_PAGE_CHUNK ), + chunk =kmalloc (struct_size (chunk, page_list, +min_t (int, ret,USNIC_UIOM_PAGE_CHUNK )),GFP_KERNEL );if (!chunk) { ret = -ENOMEM ;
Signature · 1 line
2.20.1
Jason Gunthorpe
AppliedQuoted 14 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 =
kmalloc(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:
Quoted 8 lines
instance =
kmalloc(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/infiniband/hw/usnic/usnic_uiom.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
Applied to for-next, thanks
Jason