Fix 5cae5d8ed9a97

Signed-off-by: Liam R. Howlett <Liam.Howlett@oracle.com>

diff --git a/mm/mmap.c b/mm/mmap.c
index 1b3600152f6f5f8dddaf9f4470fffdfa435fae21..46979f95d12ace92b6f23f2f1eebb158bf7bf3fe 100644 (file)
--- a/mm/mmap.c
+++ b/mm/mmap.c
@@ -1959,8 +1959,8 @@ int expand_upwards(struct vm_area_struct *vma, unsigned long address)
        if (gap_addr < address || gap_addr > TASK_SIZE)
                gap_addr = TASK_SIZE;
 
-       next = vma_find(mm, vma->vm_end);
-       if (next && next->vm_start < gap_addr && vma_is_accessible(next)) {
+       next = find_vma_intersection(mm, vma->vm_end, gap_addr);
+       if (next && vma_is_accessible(next)) {
                if (!(next->vm_flags & VM_GROWSUP))
                        return -ENOMEM;
                /* Check that both stack segments have the same anon_vma? */