[IA64] kprobes: fixup the pagefault exception caused by probehandlers

If the user-specified kprobe handler causes the page fault when accessing
user space address, fixup this fault since do_page_fault() should not
continue as the kprobe handler are run with preemption disabled.

Signed-off-by: Anil S Keshavamurthy <anil.s.keshavamurthy@intel.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Tony Luck <tony.luck@intel.com>
This commit is contained in:
Keshavamurthy Anil S 2006-09-25 16:32:20 -07:00 committed by Tony Luck
parent 214ddde2f9
commit fd32cb3a9c
1 changed files with 6 additions and 0 deletions

View File

@ -771,6 +771,12 @@ static int __kprobes kprobes_fault_handler(struct pt_regs *regs, int trapnr)
*/ */
if (cur->fault_handler && cur->fault_handler(cur, regs, trapnr)) if (cur->fault_handler && cur->fault_handler(cur, regs, trapnr))
return 1; return 1;
/*
* In case the user-specified fault handler returned
* zero, try to fix up.
*/
if (ia64_done_with_exception(regs))
return 1;
/* /*
* Let ia64_do_page_fault() fix it. * Let ia64_do_page_fault() fix it.