Commit 30a42155 authored by Masami Hiramatsu (Google)'s avatar Masami Hiramatsu (Google) Committed by Will Deacon
Browse files

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: default avatarMasami Hiramatsu (Google) <mhiramat@kernel.org>
Acked-by: default avatarMark Rutland <mark.rutland@arm.com>
Link: https://lore.kernel.org/r/166994752269.439920.4801339965959400456.stgit@devnote3


Signed-off-by: default avatarWill Deacon <will@kernel.org>
parent 0fbcd8ab

arch/arm64/kernel/probes/kprobes.c

+0 −8
Original line number Diff line number Diff line
@@ -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;

}