summaryrefslogtreecommitdiff
path: root/mm
diff options
context:
space:
mode:
authorAl Viro <viro@ZenIV.linux.org.uk>2012-03-05 06:39:47 +0000
committerLinus Torvalds <torvalds@linux-foundation.org>2012-03-05 13:51:32 -0800
commit835ee7978cb47de94cf70232a694f19295d2993f (patch)
tree0befe356dba1efbe02bf7ced7285f7dea94936fd /mm
parent6414fa6a150111750011f477899d370244da4171 (diff)
downloadlinux-3.10-835ee7978cb47de94cf70232a694f19295d2993f.tar.gz
linux-3.10-835ee7978cb47de94cf70232a694f19295d2993f.tar.bz2
linux-3.10-835ee7978cb47de94cf70232a694f19295d2993f.zip
VM_GROWS{UP,DOWN} shouldn't be set on shmem VMAs
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'mm')
-rw-r--r--mm/mmap.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/mm/mmap.c b/mm/mmap.c
index 3f758c7f4c8..22e1a0b2f70 100644
--- a/mm/mmap.c
+++ b/mm/mmap.c
@@ -1293,6 +1293,8 @@ munmap_back:
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;