Eric Lee / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 4a2ae92993be24ba727faa733e99d7980d389ec0

Authored by Gustavo A. R. Silva
Committed by Linus Torvalds
1 parent 667da6a268
Exists in smarc_imx_lf-5.15.y and in 13 other branches 8mp-imx_5.4.70_2.3.0, 8qm-imx_5.4.70_2.3.0, emb-lf-6.6.52-2.2.0, emb_imx_lf-5.15.y, emb_lf-6.1.y, emb_lf-6.6.y, pitx_8mp_lf-5.10.y, rt_linux_5.15.71, smarc-8m-android-11.0.0_2.0.0, smarc_8mm_imx_5.4.24_2.1.0, smarc_8mp_lf-5.10.y, smarc_8mq_imx_5.4.24_2.1.0, smarc_8mq_lf-5.10.y

ipc/sem.c: replace kvmalloc/memset with kvzalloc and use struct_size 

Use kvzalloc() instead of kvmalloc() and memset().

Also, make use of the struct_size() helper instead of the open-coded
version in order to avoid any potential type mistakes.

This code was detected with the help of Coccinelle.

Link: http://lkml.kernel.org/r/20190131214221.GA28930@embeddedor
Signed-off-by: Gustavo A. R. Silva <gustavo@embeddedor.com>
Reviewed-by: Andrew Morton <akpm@linux-foundation.org>
Cc: Davidlohr Bueso <dave@stgolabs.net>
Cc: Manfred Spraul <manfred@colorfullife.com>
Cc: Kees Cook <keescook@chromium.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

Showing 1 changed file with 1 additions and 5 deletions Side-by-side Diff

... ... @@ -488,17 +488,13 @@
488 488 static struct sem_array *sem_alloc(size_t nsems)
489 489 {
490 490 struct sem_array *sma;
491   - size_t size;
492 491  
493 492 if (nsems > (INT_MAX - sizeof(*sma)) / sizeof(sma->sems[0]))
494 493 return NULL;
495 494  
496   - size = sizeof(*sma) + nsems * sizeof(sma->sems[0]);
497   - sma = kvmalloc(size, GFP_KERNEL);
  495 + sma = kvzalloc(struct_size(sma, sems, nsems), GFP_KERNEL);
498 496 if (unlikely(!sma))
499 497 return NULL;
500   -
501   - memset(sma, 0, size);
502 498  
503 499 return sma;
504 500 }