[FIX] Fix wrong functions w/o returns determination (bl,blx)

[kernel/swap-modules.git] / kprobe / dbi_kprobes.c

diff --git a/kprobe/dbi_kprobes.c b/kprobe/dbi_kprobes.c
index 9d66ac1..e5855bd 100644 (file)
--- a/kprobe/dbi_kprobes.c
+++ b/kprobe/dbi_kprobes.c
@@ -633,6 +633,14 @@ int pre_handler_kretprobe (struct kprobe *p, struct pt_regs *regs)
        unsigned long flags = 0;
        DBPRINTF ("START\n");
 
+       if (p && p->tgid) {     /* Userspace */
+               if (unlikely(thumb_mode(regs))) {
+                       if (!rp->thumb_noret)
+                               return 0;
+               } else if (!rp->arm_noret)
+                       return 0;
+       }
+
        /*TODO: consider to only swap the RA after the last pre_handler fired */
        spin_lock_irqsave (&kretprobe_lock, flags);
        if (!rp->disarm)