p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

ima: 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;
   struct boo entry[];
};

instance = kzalloc(sizeof(struct foo) + count * sizeof(struct boo), 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 <gustavo@embeddedor.com>
Signed-off-by: Mimi Zohar <zohar@linux.ibm.com>
This commit is contained in:
Gustavo A. R. Silva 2019-05-29 11:53:43 -05:00 committed by Mimi Zohar
parent cbc0425d3d
commit fa5b571753
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
security/integrity/ima/ima_template.c
View File

@ -306,9 +306,8 @@ static int ima_restore_template_data(struct ima_template_desc *template_desc,
int ret = 0; int ret = 0;
int i; int i;
*entry = kzalloc(sizeof(**entry) + *entry = kzalloc(struct_size(*entry, template_data,
template_desc->num_fields * sizeof(struct ima_field_data), template_desc->num_fields), GFP_NOFS);
GFP_NOFS);
if (!*entry) if (!*entry)
return -ENOMEM; return -ENOMEM;