Commit 42c36f63 authored by Hugh Dickins's avatar Hugh Dickins Committed by Linus Torvalds

vm: fix vm_pgoff wrap in upward expansion

Commit a626ca6a ("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: default avatarHugh Dickins <hughd@google.com>
Cc: stable@kernel.org
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent c191f6cc
...@@ -1767,12 +1767,15 @@ int expand_upwards(struct vm_area_struct *vma, unsigned long address) ...@@ -1767,12 +1767,15 @@ int expand_upwards(struct vm_area_struct *vma, unsigned long address)
size = address - vma->vm_start; size = address - vma->vm_start;
grow = (address - vma->vm_end) >> PAGE_SHIFT; grow = (address - vma->vm_end) >> PAGE_SHIFT;
error = -ENOMEM;
if (vma->vm_pgoff + (size >> PAGE_SHIFT) >= vma->vm_pgoff) {
error = acct_stack_growth(vma, size, grow); error = acct_stack_growth(vma, size, grow);
if (!error) { if (!error) {
vma->vm_end = address; vma->vm_end = address;
perf_event_mmap(vma); perf_event_mmap(vma);
} }
} }
}
vma_unlock_anon_vma(vma); vma_unlock_anon_vma(vma);
khugepaged_enter_vma_merge(vma); khugepaged_enter_vma_merge(vma);
return error; return error;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment