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

Commit 35f2aaa7 authored by Martin Schwidefsky's avatar Martin Schwidefsky Committed by Martin Schwidefsky
Browse files

[S390] kprobes: single stepped breakpoint 



Remove special case of a kprobe on a breakpoint while a relocated
instruction is single stepped. The only instruction that may cause
a fault while kprobe single stepping is active is the relocated
instruction. There is no kprobe on the instruction slot retrieved
with get_insn_slot().

Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
parent 6f9a3c33

arch/s390/kernel/kprobes.c

+0 −6
Original line number Diff line number Diff line
@@ -273,12 +273,6 @@ static int __kprobes kprobe_handler(struct pt_regs *regs) 
	if (kprobe_running()) {

		p = get_kprobe(addr);

		if (p) {

			if (kcb->kprobe_status == KPROBE_HIT_SS &&

			    *p->ainsn.insn == BREAKPOINT_INSTRUCTION) {

				regs->psw.mask &= ~PSW_MASK_PER;

				regs->psw.mask |= kcb->kprobe_saved_imask;

				goto no_kprobe;

			}

			/* We have reentered the kprobe_handler(), since

			 * another probe was hit while within the handler.

			 * We here save the original kprobes variables and