diff --git a/[refs] b/[refs]
index 48703255ade7..9b187b17c927 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6414fa6a150111750011f477899d370244da4171
+refs/heads/master: 835ee7978cb47de94cf70232a694f19295d2993f
diff --git a/trunk/mm/mmap.c b/trunk/mm/mmap.c
index 3f758c7f4c81..22e1a0b2f70c 100644
--- a/trunk/mm/mmap.c
+++ b/trunk/mm/mmap.c
@@ -1293,6 +1293,8 @@ unsigned long mmap_region(struct file *file, unsigned long addr,
 		pgoff = vma->vm_pgoff;
 		vm_flags = vma->vm_flags;
 	} else if (vm_flags & VM_SHARED) {
+		if (unlikely(vm_flags & (VM_GROWSDOWN|VM_GROWSUP)))
+			goto free_vma;
 		error = shmem_zero_setup(vma);
 		if (error)
 			goto free_vma;