| From | Liam Howlett <> | Subject | [PATCH 48/94] mmap: Use find_vma_intersection in do_mmap() for overlap | Date | Wed, 28 Apr 2021 15:36:12 +0000 |
| |
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@Oracle.com> --- mm/mmap.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/mm/mmap.c b/mm/mmap.c index 6fa93606e62b..3e67fb5eac31 100644 --- a/mm/mmap.c +++ b/mm/mmap.c @@ -1425,9 +1425,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.30.2
|