diff options
| author | Keshavamurthy Anil S <anil.s.keshavamurthy@intel.com> | 2006-09-25 16:32:20 -0700 |
|---|---|---|
| committer | Tony Luck <tony.luck@intel.com> | 2006-09-26 11:33:32 -0700 |
| commit | fd32cb3a9c9f9399421408e8734cd8a6d9d1a09f (patch) | |
| tree | d030d93f169bd9ff39019dacc8f5b3c5a828b079 /arch/ia64/kernel | |
| parent | 214ddde2f95037e129eff7e895869771719c7c1b (diff) | |
[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>
Diffstat (limited to 'arch/ia64/kernel')
| -rw-r--r-- | arch/ia64/kernel/kprobes.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/arch/ia64/kernel/kprobes.c b/arch/ia64/kernel/kprobes.c index 320cb7a91c9..169ec3a7156 100644 --- a/arch/ia64/kernel/kprobes.c +++ b/arch/ia64/kernel/kprobes.c @@ -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)) 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. |