mm: Use overflow helpers in kvmalloc()

Instead of open-coded multiplication and bounds checking, use the new
overflow helper. Additionally prepare for vmalloc() users to add
array_size()-family helpers in the future.

Signed-off-by: Kees Cook <keescook@chromium.org>

diff --git a/include/linux/mm.h b/include/linux/mm.h
index 1ac1f06a4be6b22faf3883c760515a042a6d347e..7cb1c6a6bf82557dee4b05e051c655739229b97d 100644 (file)
--- a/include/linux/mm.h
+++ b/include/linux/mm.h
@@ -25,6 +25,7 @@
 #include <linux/err.h>
 #include <linux/page_ref.h>
 #include <linux/memremap.h>
+#include <linux/overflow.h>
 
 struct mempolicy;
 struct anon_vma;
@@ -560,10 +561,12 @@ static inline void *kvzalloc(size_t size, gfp_t flags)
 
 static inline void *kvmalloc_array(size_t n, size_t size, gfp_t flags)
 {
-       if (size != 0 && n > SIZE_MAX / size)
+       size_t bytes;
+
+       if (unlikely(check_mul_overflow(n, size, &bytes)))
                return NULL;
 
-       return kvmalloc(n * size, flags);
+       return kvmalloc(bytes, flags);
 }
 
 extern void kvfree(const void *addr);

diff --git a/include/linux/vmalloc.h b/include/linux/vmalloc.h
index 1e5d8c392f156a6625e282e2f741efc81533a472..398e9c95cd616f8bb461c7609b9d14c9dffe7b3c 100644 (file)
--- a/include/linux/vmalloc.h
+++ b/include/linux/vmalloc.h
@@ -8,6 +8,7 @@
 #include <linux/llist.h>
 #include <asm/page.h>          /* pgprot_t */
 #include <linux/rbtree.h>
+#include <linux/overflow.h>
 
 struct vm_area_struct;         /* vma defining user mapping in mm_types.h */
 struct notifier_block;         /* in notifier.h */