From 1a3df50a5bd40f870eaf204f5f09126ed41d56af Mon Sep 17 00:00:00 2001
From: Pekka Enberg <penberg@cs.helsinki.fi>
Date: Wed, 7 Apr 2010 19:23:41 +0300
Subject: [PATCH] --- yaml --- r: 189671 b: refs/heads/master c:
 d3e06e2b15590b70ea73733fc4612e4741ff46e0 h: refs/heads/master i:   189669:
 b2480b6227079e856230a33e7a48a35ef860a0d6   189667:
 0e767c8e6defe526cfbbe0f7ab9379413d2eeced   189663:
 24c9ab32aedb4b78f138a82c0ffe38bd363ba511 v: v3

---
 [refs]          | 2 +-
 trunk/mm/slub.c | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index f62233fe51f1..ab337d7ca479 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fc1c183353a113c71675fecd0485e5aa0fe68d72
+refs/heads/master: d3e06e2b15590b70ea73733fc4612e4741ff46e0
diff --git a/trunk/mm/slub.c b/trunk/mm/slub.c
index b364844a1068..7d6c8b1ccf63 100644
--- a/trunk/mm/slub.c
+++ b/trunk/mm/slub.c
@@ -2386,6 +2386,9 @@ int kmem_ptr_validate(struct kmem_cache *s, const void *object)
 {
 	struct page *page;
 
+	if (!kern_ptr_validate(object, s->size))
+		return 0;
+
 	page = get_object_page(object);
 
 	if (!page || s != page->slab)