From: Liam R. Howlett <Liam.Howlett@oracle.com>
Date: Thu, 24 Feb 2022 16:52:52 +0000 (-0500)
Subject: Fix 5cae5d8ed9a97
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=e0f9614f9b2c671df6c02f4fda4285fa82e31c3e;p=users%2Fjedix%2Flinux-maple.git

Fix 5cae5d8ed9a97

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

diff --git a/mm/mmap.c b/mm/mmap.c
index 1b3600152f6f..46979f95d12a 100644
--- 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? */