Message ID | 1318413796-4617-1-git-send-email-paolo.pisati@canonical.com |
---|---|
State | New |
Headers | show |
On Wed, Oct 12, 2011 at 12:03:16PM +0200, Paolo Pisati wrote: > commit upstream 42c36f63ac1366ab0ecc2d5717821362c259f517 > > Signed-off-by: Paolo Pisati <paolo.pisati@canonical.com> It is helpful later to know if this was a backport or a cherry-pick, so we tend to recommend either: (backported from commit xxx) or: (cherry-picked from commit xxx) depending which it was. -apw
diff --git a/mm/mmap.c b/mm/mmap.c index 6aa3f80..a8bde69 100644 --- a/mm/mmap.c +++ b/mm/mmap.c @@ -1737,9 +1737,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;