Commit 00afe830 authored by Peter Zijlstra's avatar Peter Zijlstra
Browse files

x86,kprobes: WARN if kprobes tries to handle a fault 



With the removal of kprobe::handle_fault there is no reason left that
kprobe_page_fault() would ever return true on x86, make sure it
doesn't happen by accident.

Signed-off-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
Acked-by: default avatarMasami Hiramatsu <mhiramat@kernel.org>
Link: https://lore.kernel.org/r/20210525073213.660594073@infradead.org
parent ec6aba3d

arch/x86/mm/fault.c

+2 −2
Original line number Diff line number Diff line
@@ -1186,7 +1186,7 @@ do_kern_addr_fault(struct pt_regs *regs, unsigned long hw_error_code, 
		return;



	/* kprobes don't want to hook the spurious faults: */

	if (kprobe_page_fault(regs, X86_TRAP_PF))

	if (WARN_ON_ONCE(kprobe_page_fault(regs, X86_TRAP_PF)))

		return;



	/*
@@ -1239,7 +1239,7 @@ void do_user_addr_fault(struct pt_regs *regs, 
	}



	/* kprobes don't want to hook the spurious faults: */

	if (unlikely(kprobe_page_fault(regs, X86_TRAP_PF)))

	if (WARN_ON_ONCE(kprobe_page_fault(regs, X86_TRAP_PF)))

		return;



	/*