|
@@ -430,6 +430,23 @@ int __kprobes trampoline_probe_handler(struct kprobe *p, struct pt_regs *regs)
|
|
|
* real return address, and all the rest will point to
|
|
|
* kretprobe_trampoline
|
|
|
*/
|
|
|
+ hlist_for_each_entry_safe(ri, node, tmp, head, hlist) {
|
|
|
+ if (ri->task != current)
|
|
|
+ /* another task is sharing our hash bucket */
|
|
|
+ continue;
|
|
|
+
|
|
|
+ orig_ret_address = (unsigned long)ri->ret_addr;
|
|
|
+ if (orig_ret_address != trampoline_address)
|
|
|
+ /*
|
|
|
+ * This is the real return address. Any other
|
|
|
+ * instances associated with this task are for
|
|
|
+ * other calls deeper on the call stack
|
|
|
+ */
|
|
|
+ break;
|
|
|
+ }
|
|
|
+
|
|
|
+ regs->cr_iip = orig_ret_address;
|
|
|
+
|
|
|
hlist_for_each_entry_safe(ri, node, tmp, head, hlist) {
|
|
|
if (ri->task != current)
|
|
|
/* another task is sharing our hash bucket */
|
|
@@ -452,8 +469,6 @@ int __kprobes trampoline_probe_handler(struct kprobe *p, struct pt_regs *regs)
|
|
|
|
|
|
kretprobe_assert(ri, orig_ret_address, trampoline_address);
|
|
|
|
|
|
- regs->cr_iip = orig_ret_address;
|
|
|
-
|
|
|
reset_current_kprobe();
|
|
|
spin_unlock_irqrestore(&kretprobe_lock, flags);
|
|
|
preempt_enable_no_resched();
|