1 files changed, 7 insertions, 1 deletions

diff --git a/mm/slab.c b/mm/slab.c
index d2cd304fd8af..1a88fded7f19 100644
--- a/mm/slab.c
+++ b/mm/slab.c
@@ -2746,7 +2746,7 @@ static int cache_grow(struct kmem_cache *cachep,
          * Be lazy and only check for valid flags here,  keeping it out of the
          * critical path in kmem_cache_alloc().
          */
-        BUG_ON(flags & ~(GFP_DMA | GFP_LEVEL_MASK));
+        BUG_ON(flags & ~(GFP_DMA | __GFP_ZERO | GFP_LEVEL_MASK));
 
         local_flags = (flags & GFP_LEVEL_MASK);
         /* Take the l3 list lock to change the colour_next on this node */
@@ -3392,6 +3392,9 @@ __cache_alloc_node(struct kmem_cache *cachep, gfp_t flags, int nodeid,
         local_irq_restore(save_flags);
         ptr = cache_alloc_debugcheck_after(cachep, flags, ptr, caller);
 
+        if (unlikely((flags & __GFP_ZERO) && ptr))
+                memset(ptr, 0, obj_size(cachep));
+
         return ptr;
 }
 
@@ -3443,6 +3446,9 @@ __cache_alloc(struct kmem_cache *cachep, gfp_t flags, void *caller)
         objp = cache_alloc_debugcheck_after(cachep, flags, objp, caller);
         prefetchw(objp);
 
+        if (unlikely((flags & __GFP_ZERO) && objp))
+                memset(objp, 0, obj_size(cachep));
+
         return objp;
 }