From: Liam R. Howlett <Liam.Howlett@oracle.com>
Date: Fri, 16 Jun 2023 13:58:58 +0000 (-0400)
Subject: arm64 fix
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=f14d45f1a2d31b403a5110487d72d6993400fa6e;p=users%2Fjedix%2Flinux-maple.git

arm64 fix

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

diff --git a/arch/arm64/mm/fault.c b/arch/arm64/mm/fault.c
index 96008b3647a4..d201a7433be4 100644
--- a/arch/arm64/mm/fault.c
+++ b/arch/arm64/mm/fault.c
@@ -616,8 +616,10 @@ static int __kprobes do_page_fault(unsigned long far, unsigned long esr,
 
 retry:
 	vma = lock_mm_and_find_vma(mm, addr, regs);
-	if (unlikely(!vma))
-		goto no_context;
+	if (unlikely(!vma)) {
+		fault = VM_FAULT_BADMAP;
+		goto done;
+	}
 
 	fault = __do_page_fault(mm, vma, addr, mm_flags, vm_flags, regs);
 
@@ -638,9 +640,7 @@ retry:
 	}
 	mmap_read_unlock(mm);
 
-#ifdef CONFIG_PER_VMA_LOCK
 done:
-#endif
 	/*
 	 * Handle the "normal" (no error) case first.
 	 */