1 files changed, 3 insertions, 1 deletions

diff --git a/mm/nommu.c b/mm/nommu.c
index eb3e2e558da1..fed1b6e9c89b 100644
--- a/mm/nommu.c
+++ b/mm/nommu.c
@@ -1261,7 +1261,9 @@ unsigned long do_mmap(struct file *file,
         add_nommu_region(region);
 
         /* clear anonymous mappings that don't ask for uninitialized data */
-        if (!vma->vm_file && !(flags & MAP_UNINITIALIZED))
+        if (!vma->vm_file &&
+            (!IS_ENABLED(CONFIG_MMAP_ALLOW_UNINITIALIZED) ||
+             !(flags & MAP_UNINITIALIZED)))
                 memset((void *)region->vm_start, 0,
                        region->vm_end - region->vm_start);