mm/mremap: use vma_lookup() in vma_to_resize()
authorLiam Howlett <liam.howlett@oracle.com>
Tue, 29 Jun 2021 02:39:47 +0000 (19:39 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 29 Jun 2021 17:53:52 +0000 (10:53 -0700)
Use vma_lookup() to find the VMA at a specific address.  As vma_lookup()
will return NULL if the address is not within any VMA, the start address
no longer needs to be validated.

Link: https://lkml.kernel.org/r/20210521174745.2219620-21-Liam.Howlett@Oracle.com
Signed-off-by: Liam R. Howlett <Liam.Howlett@Oracle.com>
Reviewed-by: Laurent Dufour <ldufour@linux.ibm.com>
Acked-by: David Hildenbrand <david@redhat.com>
Acked-by: Davidlohr Bueso <dbueso@suse.de>
Cc: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
mm/mremap.c

index 47c255b60150b3121c5957c302afd0051d27e3c1..a369a6100698b077a8e1274836f1478784b3ed25 100644 (file)
@@ -634,10 +634,11 @@ static struct vm_area_struct *vma_to_resize(unsigned long addr,
        unsigned long *p)
 {
        struct mm_struct *mm = current->mm;
-       struct vm_area_struct *vma = find_vma(mm, addr);
+       struct vm_area_struct *vma;
        unsigned long pgoff;
 
-       if (!vma || vma->vm_start > addr)
+       vma = vma_lookup(mm, addr);
+       if (!vma)
                return ERR_PTR(-EFAULT);
 
        /*