luck/tmp_suning_uos_patched
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ima: ima_api: Use struct_size() in kzalloc()

Browse Source 
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 ima_template_entry {
	...
        struct ima_field_data template_data[0]; /* template related data */
};

instance = kzalloc(sizeof(struct ima_template_entry) + count * sizeof(struct ima_field_data), GFP_NOFS);

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_NOFS);

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-08-29 12:29:16 -05:00 committed by Mimi Zohar
parent fa5b571753
commit 2a7f0e53da
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
security/integrity/ima/ima_api.c
View File

@ -45,8 +45,8 @@ int ima_alloc_init_template(struct ima_event_data *event_data,
else else
template_desc = ima_template_desc_current(); template_desc = ima_template_desc_current();
*entry = kzalloc(sizeof(**entry) + template_desc->num_fields * *entry = kzalloc(struct_size(*entry, template_data,
sizeof(struct ima_field_data), GFP_NOFS); template_desc->num_fields), GFP_NOFS);
if (!*entry) if (!*entry)
return -ENOMEM; return -ENOMEM;