slab: Return NULL for oversized allocations

The inline path seems to have changed the SLAB behavior for very large
kmalloc allocations with  commit e3366016 ("slab: Use common
kmalloc_index/kmalloc_size functions"). This patch restores the old
behavior but also adds diagnostics so that we can figure where in the
code these large allocations occur.

Reported-and-tested-by: Tetsuo Handa <[email protected]>
Signed-off-by: Christoph Lameter <[email protected]>
Link: http://lkml.kernel.org/r/[email protected]
[ [email protected]: use WARN_ON_ONCE ]
Signed-off-by: Pekka Enberg <[email protected]>

diff --git a/include/linux/slab_def.h b/include/linux/slab_def.h
index 113ec080313fd87f7cde61c2ec0236b69bc06485..cd401580bdd30f2f0c6fb586e8244f7e6756b1fa 100644 (file)
--- 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 2f0e7d5976cb9d47d6e91566c2668715eeee04fc..c5d352e73d81f2a6443c7cfa08e21a31ef3510c6 100644 (file)
--- 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;