Commit 35e43c5f authored by Liam Howlett's avatar Liam Howlett Committed by Linus Torvalds
Browse files

mm/mmap: use find_vma_intersection() in do_mmap() for overlap 

Using find_vma_intersection() avoids the need for a temporary variable and
makes the code cleaner.

Link: https://lkml.kernel.org/r/20210511014328.2902782-1-Liam.Howlett@Oracle.com


Signed-off-by: default avatarLiam R. Howlett <Liam.Howlett@Oracle.com>
Reviewed-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 96d99023

mm/mmap.c

+1 −3
Original line number Diff line number Diff line
@@ -1457,9 +1457,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;

	}