From: Liam R. Howlett <Liam.Howlett@Oracle.com>
Date: Thu, 8 Apr 2021 20:23:43 +0000 (-0400)
Subject: mm/ksm: Use vma_lookup() in find_mergeable_vma()
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=56eb04bf938f4bda8793e8d24357dca1db638600;p=users%2Fjedix%2Flinux-maple.git

mm/ksm: Use vma_lookup() in find_mergeable_vma()

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.

Signed-off-by: Liam R. Howlett <Liam.Howlett@Oracle.com>
---

diff --git a/mm/ksm.c b/mm/ksm.c
index 6bbe314c52603..ced6830d0ff42 100644
--- a/mm/ksm.c
+++ b/mm/ksm.c
@@ -521,10 +521,8 @@ static struct vm_area_struct *find_mergeable_vma(struct mm_struct *mm,
 	struct vm_area_struct *vma;
 	if (ksm_test_exit(mm))
 		return NULL;
-	vma = find_vma(mm, addr);
-	if (!vma || vma->vm_start > addr)
-		return NULL;
-	if (!(vma->vm_flags & VM_MERGEABLE) || !vma->anon_vma)
+	vma = vma_lookup(mm, addr);
+	if (!vma || !(vma->vm_flags & VM_MERGEABLE) || !vma->anon_vma)
 		return NULL;
 	return vma;
 }