[111/192] arch/mips/kernel/traps: use vma_lookup() instead of find_vma()

Commit Message

Andrew Morton June 29, 2021, 2:39 a.m. UTC

From: Liam Howlett <[e-mail]>
Subject: arch/mips/kernel/traps: use vma_lookup() instead of find_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.

Link: https://lkml.kernel.org/r/[e-mail]
Signed-off-by: Liam R. Howlett <[e-mail]>
Reviewed-by: Laurent Dufour <[e-mail]>
Acked-by: David Hildenbrand <[e-mail]>
Acked-by: Davidlohr Bueso <[e-mail]>
Cc: Geert Uytterhoeven <[e-mail]>
Signed-off-by: Andrew Morton <[e-mail]>
---

 arch/mips/kernel/traps.c |    4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

Patch

--- a/arch/mips/kernel/traps.c~arch-mips-kernel-traps-use-vma_lookup-instead-of-find_vma
+++ a/arch/mips/kernel/traps.c
@@ -784,7 +784,6 @@  void force_fcr31_sig(unsigned long fcr31
 int process_fpemu_return(int sig, void __user *fault_addr, unsigned long fcr31)
 {
 	int si_code;
-	struct vm_area_struct *vma;
 
 	switch (sig) {
 	case 0:
@@ -800,8 +799,7 @@  int process_fpemu_return(int sig, void _
 
 	case SIGSEGV:
 		mmap_read_lock(current->mm);
-		vma = find_vma(current->mm, (unsigned long)fault_addr);
-		if (vma && (vma->vm_start <= (unsigned long)fault_addr))
+		if (vma_lookup(current->mm, (unsigned long)fault_addr))
 			si_code = SEGV_ACCERR;
 		else
 			si_code = SEGV_MAPERR;