]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
arch/mips/kernel/traps: Use vma_lookup() instead of find_vma()
authorLiam R. Howlett <Liam.Howlett@Oracle.com>
Mon, 1 Mar 2021 19:29:09 +0000 (14:29 -0500)
committerLiam R. Howlett <Liam.Howlett@Oracle.com>
Thu, 6 May 2021 17:25:45 +0000 (13:25 -0400)
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>
arch/mips/kernel/traps.c

index 0b4e06303c55b5f84b5a4bd8488285790a2bb1dc..6f07362de5cec29d1d9d4870ec23da84a854748d 100644 (file)
@@ -784,7 +784,6 @@ void force_fcr31_sig(unsigned long fcr31, void __user *fault_addr,
 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 __user *fault_addr, unsigned long fcr31)
 
        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;