summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLiam Howlett <liam.howlett@oracle.com>2021-06-29 04:39:47 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2021-06-29 19:53:52 +0200
commit5aaf07f0812adef788f9f08a73914148b5fdd40e (patch)
tree8e90ad9ca25156a641556df54b1ee1b88ba37b60
parentmm/migrate: use vma_lookup() in do_pages_stat_array() (diff)
downloadlinux-5aaf07f0812adef788f9f08a73914148b5fdd40e.tar.xz
linux-5aaf07f0812adef788f9f08a73914148b5fdd40e.zip
mm/mremap: use vma_lookup() in vma_to_resize()
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>
-rw-r--r--mm/mremap.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/mm/mremap.c b/mm/mremap.c
index 47c255b60150..a369a6100698 100644
--- a/mm/mremap.c
+++ b/mm/mremap.c
@@ -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);
/*