[PATCH v2 23/70] mmap: Use find_vma_intersection in do_mmap() for overlap

Liam R. Howlett Liam.Howlett at Oracle.com
Tue Jan 12 11:11:53 EST 2021


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 at Oracle.com>
---
 mm/mmap.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/mm/mmap.c b/mm/mmap.c
index 8bc4ee7cc2fff..c0a64c4726b67 100644
--- a/mm/mmap.c
+++ b/mm/mmap.c
@@ -1445,9 +1445,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




More information about the maple-tree mailing list