---

yaml --- r: 288182 b: refs/heads/master c: 835ee79 h: refs/heads/master v: v3
git-mirror · Mar 5, 2012 · 564151a · 564151a
1 parent b9fe185
commit 564151a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git 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
@@ -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;