Skip to content

Commit 30a4215

Browse files
mhiramatwilldeacon
authored andcommitted
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) <[email protected]> Acked-by: Mark Rutland <[email protected]> Link: https://lore.kernel.org/r/166994752269.439920.4801339965959400456.stgit@devnote3 Signed-off-by: Will Deacon <[email protected]>
1 parent 0fbcd8a commit 30a4215

File tree

1 file changed

+0
-8
lines changed

1 file changed

+0
-8
lines changed

arch/arm64/kernel/probes/kprobes.c

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -294,14 +294,6 @@ int __kprobes kprobe_fault_handler(struct pt_regs *regs, unsigned int fsr)
294294
}
295295

296296
break;
297-
case KPROBE_HIT_ACTIVE:
298-
case KPROBE_HIT_SSDONE:
299-
/*
300-
* In case the user-specified fault handler returned
301-
* zero, try to fix up.
302-
*/
303-
if (fixup_exception(regs))
304-
return 1;
305297
}
306298
return 0;
307299
}

0 commit comments

Comments
 (0)