diff options
| author | Hugh Dickins <hughd@google.com> | 2011-05-09 17:44:42 -0700 |
|---|---|---|
| committer | Paul Gortmaker <paul.gortmaker@windriver.com> | 2012-08-17 15:35:42 -0400 |
| commit | 233e10c438b19b09663fa5e1aa21f70ce4b8de93 (patch) | |
| tree | d8f202c7fadaee1e5e2604e4b67b4a8bde8c6e77 /mm | |
| parent | a9b4f1a56faac050bcccec67b01faa2e78d9735b (diff) | |
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>
[PG: .34 doesn't have perf call via 3af9e859 (in .36); adjust accordingly]
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
Diffstat (limited to 'mm')
| -rw-r--r-- | mm/mmap.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/mm/mmap.c b/mm/mmap.c index fe9b76ae4238..053c5405f400 100644 --- a/mm/mmap.c +++ b/mm/mmap.c @@ -1740,9 +1740,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; |