UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
Gustavo A. R. Silva 2019-03-07 16:30:26 -08:00 committed by Linus Torvalds
parent 667da6a268
commit 4a2ae92993
1 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ipc/sem.c
View File

@ -488,18 +488,14 @@ static inline void sem_rmid(struct ipc_namespace *ns, struct sem_array *s)
static struct sem_array *sem_alloc(size_t nsems) static struct sem_array *sem_alloc(size_t nsems)
{ {
struct sem_array *sma; struct sem_array *sma;
size_t size;
if (nsems > (INT_MAX - sizeof(*sma)) / sizeof(sma->sems[0])) if (nsems > (INT_MAX - sizeof(*sma)) / sizeof(sma->sems[0]))
return NULL; return NULL;
size = sizeof(*sma) + nsems * sizeof(sma->sems[0]); sma = kvzalloc(struct_size(sma, sems, nsems), GFP_KERNEL);
sma = kvmalloc(size, GFP_KERNEL);
if (unlikely(!sma)) if (unlikely(!sma))
return NULL; return NULL;
memset(sma, 0, size);
return sma; return sma;
} }