summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHugh Dickins <hughd@google.com>2011-05-09 17:44:42 -0700
committerGreg Kroah-Hartman <gregkh@suse.de>2011-11-07 12:32:50 -0800
commitdbb6e675314ddf4f1011a080e2fee0012134f83f (patch)
tree7c0a01b789a95831f90537b0e26178f2c6e602c3
parentc1bf02fadd5bbd27c6ba3a8de4c8cdc0e36231e7 (diff)
downloadlinux-stable-dbb6e675314ddf4f1011a080e2fee0012134f83f.tar.gz
linux-stable-dbb6e675314ddf4f1011a080e2fee0012134f83f.tar.bz2
linux-stable-dbb6e675314ddf4f1011a080e2fee0012134f83f.zip
vm: fix vm_pgoff wrap in upward expansion
commit 42c36f63ac1366ab0ecc2d5717821362c259f517 upstream. Commit a626ca6a6564 ("vm: fix vm_pgoff wrap in stack expansion") fixed the case of an expanding mapping causing vm_pgoff wrapping when you had downward stack expansion. But there was another case where IA64 and PA-RISC expand mappings: upward expansion. This fixes that case too. Signed-off-by: Hugh Dickins <hughd@google.com> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r--mm/mmap.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/mm/mmap.c b/mm/mmap.c
index 537b36584e9a..4b80cbfd6c46 100644
--- a/mm/mmap.c
+++ b/mm/mmap.c
@@ -1636,9 +1636,12 @@ int expand_upwards(struct vm_area_struct *vma, unsigned long address)
size = address - vma->vm_start;
grow = (address - vma->vm_end) >> PAGE_SHIFT;
- error = acct_stack_growth(vma, size, grow);
- if (!error)
- vma->vm_end = address;
+ error = -ENOMEM;
+ if (vma->vm_pgoff + (size >> PAGE_SHIFT) >= vma->vm_pgoff) {
+ error = acct_stack_growth(vma, size, grow);
+ if (!error)
+ vma->vm_end = address;
+ }
}
anon_vma_unlock(vma);
return error;