Kprobes-fix-broken-fault-handling-for-i386
PATCH 1/5 Kprobes-fix-broken-fault-handling-for-i386
Hi,
This patch provides proper kprobes fault handling, if a user-specified pre/post handlers tries to access user address space, through copy_from_user(), get_user() etc. The user-specified fault handler gets called only if the fault occurs while executing user-specified handlers. In such a case user-specified handler is allowed to fix it first, later if the user-specifed fault handler does not fix it, we try to fix it by calling fix_exception(). The user-specified handler will not be called if the fault happens when single stepping the original instruction, instead we reset the current probe and allow the system page fault handler to fix it up.
arch/i386/kernel/kprobes.c | 57 +++++++++++++++++++++++++++++++++++++++------ 1 files changed, 50 insertions(+), 7 deletions(-)
arch/i386/kernel/kprobes.c renamed from arch/i386/kernel/kprobes.c~kprobes-i386-pagefault-handling +50 -7
@@ -35,6 +35,7 @@#include <asm/cacheflush.h> #include <asm/kdebug.h> #include <asm/desc.h> +#include <asm/uaccess.h> void jprobe_return_end (void );
@@ -544,15 +545,57 @@ static inline int kprobe_fault_handler(sstruct kprobe *cur =kprobe_running ();struct kprobe_ctlblk *kcb =get_kprobe_ctlblk (); -if (cur->fault_handler && cur->fault_handler (cur, regs, trapnr)) -return 1 ; - -if (kcb->kprobe_status &KPROBE_HIT_SS ) { -resume_execution (cur, regs, kcb); +switch (kcb->kprobe_status) { +case KPROBE_HIT_SS : +case KPROBE_REENTER : +/* +* We are here because the instruction being single +* stepped caused a page fault. We reset the current +* kprobe and the eip points back to the probe address +* and allow the page fault handler to continue as a +* normal page fault. +*/ + regs->eip = (unsigned long )cur->addr; regs->eflags |= kcb->kprobe_old_eflags; - -reset_current_kprobe (); +if (kcb->kprobe_status ==KPROBE_REENTER ) +restore_previous_kprobe (kcb); +else +reset_current_kprobe ();preempt_enable_no_resched (); +break ; +case KPROBE_HIT_ACTIVE : +case KPROBE_HIT_SSDONE : +/* +* We increment the nmissed count for accounting, +* we can also use npre/npostfault count for accouting +* these specific fault cases. +*/ +kprobes_inc_nmissed_count (cur); + +/* +* We come here because instructions in the pre/post +* handler caused the page_fault, this could happen +* if handler tries to access user space by +* copy_from_user(), get_user() etc. Let the +* user-specified handler try to fix it first. +*/ +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 (fixup_exception (regs)) +return 1 ; + +/* +* fixup_exception() could not handle it, +* Let do_page_fault() fix it. +*/ +break ; +default : +break ; }return 0 ; }
_
Signature · 5 lines
Prasanna S Panchamukhi Linux Technology Center India Software Labs, IBM Bangalore Email: [email protected] Ph: 91-80-51776329
Re: [2/5 PATCH] Kprobes-fix-broken-fault-handling-for-x86_64
This patch fixes the broken kprobes fault handling similar to i386 architecture.
arch/x86_64/kernel/kprobes.c | 62 ++++++++++++++++++++++++++++++++++++++----- 1 files changed, 55 insertions(+), 7 deletions(-)
arch/x86_64/kernel/kprobes.c renamed from arch/x86_64/kernel/kprobes.c~kprobes-x86_64-pagefault-handling +55 -7
@@ -37,10 +37,12 @@#include <linux/string.h> #include <linux/slab.h> #include <linux/preempt.h> +#include <linux/module.h> #include <asm/cacheflush.h> #include <asm/pgtable.h> #include <asm/kdebug.h> +#include <asm/uaccess.h> void jprobe_return_end (void );static void __kprobes arch_copy_kprobe (struct kprobe *p);
@@ -578,16 +580,62 @@ int __kprobes kprobe_fault_handler(struc {struct kprobe *cur =kprobe_running ();struct kprobe_ctlblk *kcb =get_kprobe_ctlblk (); +const struct exception_table_entry *fixup; -if (cur->fault_handler && cur->fault_handler (cur, regs, trapnr)) -return 1 ; - -if (kcb->kprobe_status &KPROBE_HIT_SS ) { -resume_execution (cur, regs, kcb); +switch (kcb->kprobe_status) { +case KPROBE_HIT_SS : +case KPROBE_REENTER : +/* +* We are here because the instruction being single +* stepped caused a page fault. We reset the current +* kprobe and the rip points back to the probe address +* and allow the page fault handler to continue as a +* normal page fault. +*/ + regs->rip = (unsigned long )cur->addr; regs->eflags |= kcb->kprobe_old_rflags; - -reset_current_kprobe (); +if (kcb->kprobe_status ==KPROBE_REENTER ) +restore_previous_kprobe (kcb); +else +reset_current_kprobe ();preempt_enable_no_resched (); +break ; +case KPROBE_HIT_ACTIVE : +case KPROBE_HIT_SSDONE : +/* +* We increment the nmissed count for accounting, +* we can also use npre/npostfault count for accouting +* these specific fault cases. +*/ +kprobes_inc_nmissed_count (cur); + +/* +* We come here because instructions in the pre/post +* handler caused the page_fault, this could happen +* if handler tries to access user space by +* copy_from_user(), get_user() etc. Let the +* user-specified handler try to fix it first. +*/ +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. +*/ + fixup =search_exception_tables (regs->rip); +if (fixup) { + regs->rip = fixup->fixup; +return 1 ; + } + +/* +* fixup() could not handle it, +* Let do_page_fault() fix it. +*/ +break ; +default : +break ; }return 0 ; }
_
Signature · 5 lines
Prasanna S Panchamukhi Linux Technology Center India Software Labs, IBM Bangalore Email: [email protected] Ph: 91-80-51776329
Re: [3/5 PATCH] Kprobes-fix-broken-fault-handling-for-powerpc64
This patch fixes the broken kprobes fault handling similar to i386 architecture.
arch/powerpc/kernel/kprobes.c | 61 +++++++++++++++++++++++++++++++++++++----- 1 files changed, 54 insertions(+), 7 deletions(-)
arch/powerpc/kernel/kprobes.c renamed from arch/powerpc/kernel/kprobes.c~kprobes-powerpc-pagefault-handling +54 -7
@@ -30,9 +30,11 @@#include <linux/kprobes.h> #include <linux/ptrace.h> #include <linux/preempt.h> +#include <linux/module.h> #include <asm/cacheflush.h> #include <asm/kdebug.h> #include <asm/sstep.h> +#include <asm/uaccess.h> DEFINE_PER_CPU(struct kprobe *, current_kprobe) = NULL; DEFINE_PER_CPU(struct kprobe_ctlblk, kprobe_ctlblk);
@@ -372,17 +374,62 @@ static inline int kprobe_fault_handler(s {struct kprobe *cur =kprobe_running ();struct kprobe_ctlblk *kcb =get_kprobe_ctlblk (); +const struct exception_table_entry *entry; -if (cur->fault_handler && cur->fault_handler (cur, regs, trapnr)) -return 1 ; - -if (kcb->kprobe_status &KPROBE_HIT_SS ) { -resume_execution (cur, regs); +switch (kcb->kprobe_status) { +case KPROBE_HIT_SS : +case KPROBE_REENTER : +/* +* We are here because the instruction being single +* stepped caused a page fault. We reset the current +* kprobe and the nip points back to the probe address +* and allow the page fault handler to continue as a +* normal page fault. +*/ + regs->nip = (unsigned long )cur->addr; regs->msr &= ~MSR_SE ; regs->msr |= kcb->kprobe_saved_msr; - -reset_current_kprobe (); +if (kcb->kprobe_status ==KPROBE_REENTER ) +restore_previous_kprobe (kcb); +else +reset_current_kprobe ();preempt_enable_no_resched (); +break ; +case KPROBE_HIT_ACTIVE : +case KPROBE_HIT_SSDONE : +/* +* We increment the nmissed count for accounting, +* we can also use npre/npostfault count for accouting +* these specific fault cases. +*/ +kprobes_inc_nmissed_count (cur); + +/* +* We come here because instructions in the pre/post +* handler caused the page_fault, this could happen +* if handler tries to access user space by +* copy_from_user(), get_user() etc. Let the +* user-specified handler try to fix it first. +*/ +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 ((entry =search_exception_tables (regs->nip)) !=NULL ) { + regs->nip = entry->fixup; +return 1 ; + } + +/* +* fixup_exception() could not handle it, +* Let do_page_fault() fix it. +*/ +break ; +default : +break ; }return 0 ; }
_
Signature · 5 lines
Prasanna S Panchamukhi Linux Technology Center India Software Labs, IBM Bangalore Email: [email protected] Ph: 91-80-51776329
Prasanna S Panchamukhi
Acked-by Anil S KeshavamurthyRe: [4/5 PATCH] Kprobes-fix-broken-fault-handling-for-ia64
This patch fixes the broken kprobes fault handling similar to i386 architecture.
arch/ia64/kernel/kprobes.c | 48 ++++++++++++++++++++++++++++++++++++++++----- 1 files changed, 43 insertions(+), 5 deletions(-)
arch/ia64/kernel/kprobes.c renamed from arch/ia64/kernel/kprobes.c~kprobes-ia64-pagefault-handling +43 -5
@@ -34,6 +34,7 @@#include <asm/pgtable.h> #include <asm/kdebug.h> #include <asm/sections.h> +#include <asm/uaccess.h> extern void jprobe_inst_return (void );
@@ -722,13 +723,50 @@ static int __kprobes kprobes_fault_handlstruct kprobe *cur =kprobe_running ();struct kprobe_ctlblk *kcb =get_kprobe_ctlblk (); -if (cur->fault_handler && cur->fault_handler (cur, regs, trapnr)) -return 1 ; -if (kcb->kprobe_status &KPROBE_HIT_SS ) { -resume_execution (cur, regs); -reset_current_kprobe (); +switch (kcb->kprobe_status) { +case KPROBE_HIT_SS : +case KPROBE_REENTER : +/* +* We are here because the instruction being single +* stepped caused a page fault. We reset the current +* kprobe and the instruction pointer points back to +* the probe address and allow the page fault handler +* to continue as a normal page fault. +*/ + regs->cr_iip = ((unsigned long )cur->addr) & ~0xFULL ; +ia64_psr (regs)->ri = ((unsigned long )cur->addr) &0xf ; +if (kcb->kprobe_status ==KPROBE_REENTER ) +restore_previous_kprobe (kcb); +else +reset_current_kprobe ();preempt_enable_no_resched (); +break ; +case KPROBE_HIT_ACTIVE : +case KPROBE_HIT_SSDONE : +/* +* We increment the nmissed count for accounting, +* we can also use npre/npostfault count for accouting +* these specific fault cases. +*/ +kprobes_inc_nmissed_count (cur); + +/* +* We come here because instructions in the pre/post +* handler caused the page_fault, this could happen +* if handler tries to access user space by +* copy_from_user(), get_user() etc. Let the +* user-specified handler try to fix it first. +*/ +if (cur->fault_handler && cur->fault_handler (cur, regs, trapnr)) +return 1 ; + +/* +* Let ia64_do_page_fault() fix it. +*/ +break ; +default : +break ; }return 0 ;
_
Signature · 5 lines
Prasanna S Panchamukhi Linux Technology Center India Software Labs, IBM Bangalore Email: [email protected] Ph: 91-80-51776329
Re: [5/5 PATCH] Kprobes-fix-broken-fault-handling-for-sparc64
This patch fixes the broken kprobes fault handling similar to i386 architecture. I could not test this patch for sparc64.
arch/sparc64/kernel/kprobes.c | 66 ++++++++++++++++++++++++++++++++++++++---- 1 files changed, 60 insertions(+), 6 deletions(-)
arch/sparc64/kernel/kprobes.c renamed from arch/sparc64/kernel/kprobes.c~kprobes-sparc64-pagefault-handling +60 -6
@@ -6,9 +6,11 @@#include <linux/config.h> #include <linux/kernel.h> #include <linux/kprobes.h> +#include <linux/module.h> #include <asm/kdebug.h> #include <asm/signal.h> #include <asm/cacheflush.h> +#include <asm/uaccess.h> /* We do not have hardware single-stepping on sparc64. * So we implement software single-stepping with breakpoint
@@ -302,16 +304,68 @@ static inline int kprobe_fault_handler(s {struct kprobe *cur =kprobe_running ();struct kprobe_ctlblk *kcb =get_kprobe_ctlblk (); +const struct exception_table_entry *entry; -if (cur->fault_handler && cur->fault_handler (cur, regs, trapnr)) -return 1 ; +switch (kcb->kprobe_status) { +case KPROBE_HIT_SS : +case KPROBE_REENTER : +/* +* We are here because the instruction being single +* stepped caused a page fault. We reset the current +* kprobe and the tpc points back to the probe address +* and allow the page fault handler to continue as a +* normal page fault. +*/ + regs->tpc = (unsigned long ) curr->addr; + regs->tnpc = kcb->kprobe_orig_tnpc; + regs->tstate = ((regs->tstate & ~TSTATE_PIL ) | + kcb->kprobe_orig_tstate_pil); +if (kcb->kprobe_status ==KPROBE_REENTER ) +restore_previous_kprobe (kcb); +else +reset_current_kprobe (); +preempt_enable_no_resched (); +break ; +case KPROBE_HIT_ACTIVE : +case KPROBE_HIT_SSDONE : +/* +* We increment the nmissed count for accounting, +* we can also use npre/npostfault count for accouting +* these specific fault cases. +*/ +kprobes_inc_nmissed_count (cur); -if (kcb->kprobe_status &KPROBE_HIT_SS ) { -resume_execution (cur, regs, kcb); +/* +* We come here because instructions in the pre/post +* handler caused the page_fault, this could happen +* if handler tries to access user space by +* copy_from_user(), get_user() etc. Let the +* user-specified handler try to fix it first. +*/ +if (cur->fault_handler && cur->fault_handler (cur, regs, trapnr)) +return 1 ; -reset_current_kprobe (); -preempt_enable_no_resched (); +/* +* In case the user-specified fault handler returned +* zero, try to fix up. +*/ + + entry =search_exception_tables (regs->tpc); +if (entry) { + regs->tpc = entry->fixup; + regs->tnpc = regs->tpc +4 ; +return 1 ; + } + +/* +* fixup_exception() could not handle it, +* Let do_page_fault() fix it. +*/ +break ; +default : +break ; } +return 0 ; }
_
Signature · 5 lines
Prasanna S Panchamukhi Linux Technology Center India Software Labs, IBM Bangalore Email: [email protected] Ph: 91-80-51776329