[PATCH 24/28] mmap: Use find_vma_intersection in do_mmap() for overlap

From: Liam R. Howlett
Date: Thu Dec 10 2020 - 13:11:04 EST


When detecting a conflict with MAP_FIXED_NOREPLACE, using the new interface avoids
the need for a temp variable

Signed-off-by: Liam R. Howlett <Liam.Howlett@xxxxxxxxxx>
---
mm/mmap.c | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/mm/mmap.c b/mm/mmap.c
index 4ef32ed2c34dc..48ab40a90428b 100644
--- a/mm/mmap.c
+++ b/mm/mmap.c
@@ -1433,9 +1433,7 @@ unsigned long do_mmap(struct file *file, unsigned long addr,
return addr;

if (flags & MAP_FIXED_NOREPLACE) {
- struct vm_area_struct *vma = find_vma(mm, addr);
-
- if (vma && vma->vm_start < addr + len)
+ if (find_vma_intersection(mm, addr, addr + len))
return -EEXIST;
}

--
2.28.0