Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ddc66df8 authored by Masami Hiramatsu's avatar Masami Hiramatsu Committed by Ingo Molnar
Browse files

x86: fix kprobe_handler reenable preemption 



Fix a preemption bug in kprobe_handler(). It has to call preempt_enable()
before returning.

Signed-off-by: default avatarMasami Hiramatsu <mhiramat@redhat.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent bde6f5f5

arch/x86/kernel/kprobes.c

+2 −1
Original line number Original line Diff line number Diff line
@@ -467,7 +467,8 @@ static int __kprobes kprobe_handler(struct pt_regs *regs) 
				arch_disarm_kprobe(p);

				arch_disarm_kprobe(p);

				regs->ip = (unsigned long)p->addr;

				regs->ip = (unsigned long)p->addr;

				reset_current_kprobe();

				reset_current_kprobe();

				return 1;

				ret = 1;

				goto no_kprobe;

#endif

#endif

			}

			}

			/* We have reentered the kprobe_handler(), since

			/* We have reentered the kprobe_handler(), since