2 files changed, 9 insertions, 0 deletions

diff --git a/include/linux/slab_def.h b/include/linux/slab_def.h
index 113ec080313f..cd401580bdd3 100644
--- a/include/linux/slab_def.h
+++ b/include/linux/slab_def.h
@@ -126,6 +126,9 @@ static __always_inline void *kmalloc(size_t size, gfp_t flags)
                 if (!size)
                         return ZERO_SIZE_PTR;
 
+                if (WARN_ON_ONCE(size > KMALLOC_MAX_SIZE))
+                        return NULL;
+
                 i = kmalloc_index(size);
 
 #ifdef CONFIG_ZONE_DMA
@@ -172,6 +175,9 @@ static __always_inline void *kmalloc_node(size_t size, gfp_t flags, int node)
                 if (!size)
                         return ZERO_SIZE_PTR;
 
+                if (WARN_ON_ONCE(size > KMALLOC_MAX_SIZE))
+                        return NULL;
+
                 i = kmalloc_index(size);
 
 #ifdef CONFIG_ZONE_DMA
diff --git a/mm/slab_common.c b/mm/slab_common.c
index 2f0e7d5976cb..c5d352e73d81 100644
--- a/mm/slab_common.c
+++ b/mm/slab_common.c
@@ -373,6 +373,9 @@ struct kmem_cache *kmalloc_slab(size_t size, gfp_t flags)
 {
         int index;
 
+        if (WARN_ON_ONCE(size > KMALLOC_MAX_SIZE))
+                return NULL;
+
         if (size <= 192) {
                 if (!size)
                         return ZERO_SIZE_PTR;