Skip to content

Commit 2a7f0e5

Browse files
GustavoARSilvamimizohar
authored andcommitted
ima: ima_api: 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 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 <[email protected]> Signed-off-by: Mimi Zohar <[email protected]>
1 parent fa5b571 commit 2a7f0e5

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

security/integrity/ima/ima_api.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,8 @@ int ima_alloc_init_template(struct ima_event_data *event_data,
4545
else
4646
template_desc = ima_template_desc_current();
4747

48-
*entry = kzalloc(sizeof(**entry) + template_desc->num_fields *
49-
sizeof(struct ima_field_data), GFP_NOFS);
48+
*entry = kzalloc(struct_size(*entry, template_data,
49+
template_desc->num_fields), GFP_NOFS);
5050
if (!*entry)
5151
return -ENOMEM;
5252

0 commit comments

Comments
 (0)