---

yaml --- r: 189671 b: refs/heads/master c: d3e06e2 h: refs/heads/master i: 189669: b2480b6 189667: 0e767c8 189663: 24c9ab3 v: v3
git-mirror · Apr 9, 2010 · 1a3df50 · 1a3df50
1 parent 47c7e5b
commit 1a3df50
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git 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
@@ -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)