diff --git a/[refs] b/[refs] index 72dddc1d1b0f..1aff3560b361 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 398499d5f3613c47f2143b8c54a04efb5d7a6da9 +refs/heads/master: fe1ff49d0d1c30254dbfc84c3786eb538e0cc7d1 diff --git a/trunk/mm/slub.c b/trunk/mm/slub.c index 0a216aae227e..4996fc719552 100644 --- a/trunk/mm/slub.c +++ b/trunk/mm/slub.c @@ -3345,6 +3345,9 @@ struct kmem_cache *kmem_cache_create(const char *name, size_t size, { struct kmem_cache *s; + if (WARN_ON(!name)) + return NULL; + down_write(&slub_lock); s = find_mergeable(size, align, flags, name, ctor); if (s) {