From: Masami Hiramatsu (Google) <mhiramat@kernel.org>
Date: Fri, 2 Dec 2022 02:18:42 +0000 (+0900)
Subject: arm64: kprobes: Let arch do_page_fault() fix up page fault in user handler
X-Git-Tag: 6.2-rc-smb3-client-fixes-part2~154^2~8^2~1
X-Git-Url: http://git.samba.org/?a=commitdiff_plain;h=30a421552373d2becb378282408a399702a0f00a;p=sfrench%2Fcifs-2.6.git

arm64: kprobes: Let arch do_page_fault() fix up page fault in user handler

Since arm64's do_page_fault() can handle the page fault correctly
than kprobe_fault_handler() according to the context, let it handle
the page fault instead of simply call fixup_exception() in the
kprobe_fault_handler().

Signed-off-by: Masami Hiramatsu (Google) <mhiramat@kernel.org>
Acked-by: Mark Rutland <mark.rutland@arm.com>
Link: https://lore.kernel.org/r/166994752269.439920.4801339965959400456.stgit@devnote3
Signed-off-by: Will Deacon <will@kernel.org>
---

diff --git a/arch/arm64/kernel/probes/kprobes.c b/arch/arm64/kernel/probes/kprobes.c
index c9e4d0720285..d2ae37f89774 100644
--- a/arch/arm64/kernel/probes/kprobes.c
+++ b/arch/arm64/kernel/probes/kprobes.c
@@ -294,14 +294,6 @@ int __kprobes kprobe_fault_handler(struct pt_regs *regs, unsigned int fsr)
 		}
 
 		break;
-	case KPROBE_HIT_ACTIVE:
-	case KPROBE_HIT_SSDONE:
-		/*
-		 * In case the user-specified fault handler returned
-		 * zero, try to fix up.
-		 */
-		if (fixup_exception(regs))
-			return 1;
 	}
 	return 0;
 }