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)