From 28a63612088d57ffd4933be6143e78ee2efa3395 Mon Sep 17 00:00:00 2001
From: Christoph Lameter <cl@linux.com>
Date: Fri, 3 May 2013 15:43:18 +0000
Subject: [PATCH] --- yaml --- r: 373741 b: refs/heads/master c:
 6286ae97d10ea2b5cd90532163797ab217bfdbdf h: refs/heads/master i:   373739:
 2e8b5219fffde42b8074bffe9a9714fe39443b86 v: v3

---
 [refs]                         | 2 +-
 trunk/include/linux/slab_def.h | 6 ++++++
 trunk/mm/slab_common.c         | 3 +++
 3 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 2a8b5b2e3455..6b74acef9c88 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 14e50c6a9bc2b283bb4021026226268312ceefdd
+refs/heads/master: 6286ae97d10ea2b5cd90532163797ab217bfdbdf
diff --git a/trunk/include/linux/slab_def.h b/trunk/include/linux/slab_def.h
index 113ec080313f..cd401580bdd3 100644
--- a/trunk/include/linux/slab_def.h
+++ b/trunk/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/trunk/mm/slab_common.c b/trunk/mm/slab_common.c
index 2f0e7d5976cb..c5d352e73d81 100644
--- a/trunk/mm/slab_common.c
+++ b/trunk/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;