2 files changed, 7 insertions, 3 deletions

diff --git a/include/linux/slub_def.h b/include/linux/slub_def.h
index 30b154ce728..f8e0c86c48a 100644
--- a/include/linux/slub_def.h
+++ b/include/linux/slub_def.h
@@ -80,8 +80,12 @@ extern struct kmem_cache kmalloc_caches[KMALLOC_SHIFT_HIGH + 1];
  */
 static inline int kmalloc_index(int size)
 {
-        if (size == 0)
-                return 0;
+        /*
+         * We should return 0 if size == 0 but we use the smallest object
+         * here for SLAB legacy reasons.
+         */
+        WARN_ON_ONCE(size == 0);
+
         if (size > 64 && size <= 96)
                 return 1;
         if (size > 128 && size <= 192)
diff --git a/mm/slub.c b/mm/slub.c
index 4a8585befd8..9d52cce7c99 100644
--- a/mm/slub.c
+++ b/mm/slub.c
@@ -1979,7 +1979,7 @@ static struct kmem_cache *get_slab(size_t size, gfp_t flags)
 {
         int index = kmalloc_index(size);
 
-        if (!size)
+        if (!index)
                 return NULL;
 
         /* Allocation too large? */