1 files changed, 20 insertions, 2 deletions

diff --git a/arch/x86/kernel/kprobes/core.c b/arch/x86/kernel/kprobes/core.c
index 18fbe9be2d68..fed46ddb1eef 100644
--- a/arch/x86/kernel/kprobes/core.c
+++ b/arch/x86/kernel/kprobes/core.c
@@ -749,11 +749,16 @@ asm(
 NOKPROBE_SYMBOL(kretprobe_trampoline);
 STACK_FRAME_NON_STANDARD(kretprobe_trampoline);
 
+static struct kprobe kretprobe_kprobe = {
+        .addr = (void *)kretprobe_trampoline,
+};
+
 /*
  * Called from kretprobe_trampoline
  */
 static __used void *trampoline_handler(struct pt_regs *regs)
 {
+        struct kprobe_ctlblk *kcb;
         struct kretprobe_instance *ri = NULL;
         struct hlist_head *head, empty_rp;
         struct hlist_node *tmp;
@@ -763,6 +768,17 @@ static __used void *trampoline_handler(struct pt_regs *regs)
         void *frame_pointer;
         bool skipped = false;
 
+        preempt_disable();
+
+        /*
+         * Set a dummy kprobe for avoiding kretprobe recursion.
+         * Since kretprobe never run in kprobe handler, kprobe must not
+         * be running at this point.
+         */
+        kcb = get_kprobe_ctlblk();
+        __this_cpu_write(current_kprobe, &kretprobe_kprobe);
+        kcb->kprobe_status = KPROBE_HIT_ACTIVE;
+
         INIT_HLIST_HEAD(&empty_rp);
         kretprobe_hash_lock(current, &head, &flags);
         /* fixup registers */
@@ -838,10 +854,9 @@ static __used void *trampoline_handler(struct pt_regs *regs)
                 orig_ret_address = (unsigned long)ri->ret_addr;
                 if (ri->rp && ri->rp->handler) {
                         __this_cpu_write(current_kprobe, &ri->rp->kp);
-                        get_kprobe_ctlblk()->kprobe_status = KPROBE_HIT_ACTIVE;
                         ri->ret_addr = correct_ret_addr;
                         ri->rp->handler(ri, regs);
-                        __this_cpu_write(current_kprobe, NULL);
+                        __this_cpu_write(current_kprobe, &kretprobe_kprobe);
                 }
 
                 recycle_rp_inst(ri, &empty_rp);
@@ -857,6 +872,9 @@ static __used void *trampoline_handler(struct pt_regs *regs)
 
         kretprobe_hash_unlock(current, &flags);
 
+        __this_cpu_write(current_kprobe, NULL);
+        preempt_enable();
+
         hlist_for_each_entry_safe(ri, tmp, &empty_rp, hlist) {
                 hlist_del(&ri->hlist);
                 kfree(ri);