From: Liam R. Howlett <Liam.Howlett@Oracle.com>
Date: Thu, 8 Apr 2021 20:18:41 +0000 (-0400)
Subject: kernel/events/uprobes: Use vma_lookup() in find_active_uprobe()
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=59f770fe56e15d6c7beeb957459dccafbd01765d;p=users%2Fjedix%2Flinux-maple.git

kernel/events/uprobes: Use vma_lookup() in find_active_uprobe()

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/kernel/events/uprobes.c b/kernel/events/uprobes.c
index 6addc97803198..907d4ee00cb2f 100644
--- a/kernel/events/uprobes.c
+++ b/kernel/events/uprobes.c
@@ -2046,8 +2046,8 @@ static struct uprobe *find_active_uprobe(unsigned long bp_vaddr, int *is_swbp)
 	struct vm_area_struct *vma;
 
 	mmap_read_lock(mm);
-	vma = find_vma(mm, bp_vaddr);
-	if (vma && vma->vm_start <= bp_vaddr) {
+	vma = vma_lookup(mm, bp_vaddr);
+	if (vma) {
 		if (valid_vma(vma, false)) {
 			struct inode *inode = file_inode(vma->vm_file);
 			loff_t offset = vaddr_to_offset(vma, bp_vaddr);