projects
/
platform
/
kernel
/
linux-starfive.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'usercopy-v4.8' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux
[platform/kernel/linux-starfive.git]
/
include
/
linux
/
slab.h
diff --git
a/include/linux/slab.h
b/include/linux/slab.h
index
96a16a3
..
4293808
100644
(file)
--- a/
include/linux/slab.h
+++ b/
include/linux/slab.h
@@
-577,6
+577,8
@@
static inline void *kmalloc_array(size_t n, size_t size, gfp_t flags)
{
if (size != 0 && n > SIZE_MAX / size)
return NULL;
+ if (__builtin_constant_p(n) && __builtin_constant_p(size))
+ return kmalloc(n * size, flags);
return __kmalloc(n * size, flags);
}