Skip to content

Commit 9abdb50

Browse files
GustavoARSilvatorvalds
authored andcommitted
kernel/gcov/gcc_3_4.c: 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. Link: http://lkml.kernel.org/r/20190109172445.GA15908@embeddedor Signed-off-by: Gustavo A. R. Silva <[email protected]> Reviewed-by: Peter Oberparleiter <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
1 parent 32a5ad9 commit 9abdb50

File tree

1 file changed

+2
-4
lines changed

1 file changed

+2
-4
lines changed

kernel/gcov/gcc_3_4.c

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -245,8 +245,7 @@ struct gcov_info *gcov_info_dup(struct gcov_info *info)
245245

246246
/* Duplicate gcov_info. */
247247
active = num_counter_active(info);
248-
dup = kzalloc(sizeof(struct gcov_info) +
249-
sizeof(struct gcov_ctr_info) * active, GFP_KERNEL);
248+
dup = kzalloc(struct_size(dup, counts, active), GFP_KERNEL);
250249
if (!dup)
251250
return NULL;
252251
dup->version = info->version;
@@ -364,8 +363,7 @@ struct gcov_iterator *gcov_iter_new(struct gcov_info *info)
364363
{
365364
struct gcov_iterator *iter;
366365

367-
iter = kzalloc(sizeof(struct gcov_iterator) +
368-
num_counter_active(info) * sizeof(struct type_info),
366+
iter = kzalloc(struct_size(iter, type_info, num_counter_active(info)),
369367
GFP_KERNEL);
370368
if (iter)
371369
iter->info = info;

0 commit comments

Comments
 (0)