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

Commit 35df8d53 authored by Heiko Carstens's avatar Heiko Carstens Committed by Martin Schwidefsky
Browse files

[S390] Fix kprobes breakpoint handling. 



In case of an illegal op the die notifier gets called with DIE_TRAP
instead of DIE_BPT first.

Signed-off-by: default avatarHeiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
parent d58140cc

arch/s390/kernel/traps.c

+9 −2
Original line number Original line Diff line number Diff line
@@ -490,8 +490,15 @@ static void illegal_op(struct pt_regs * regs, long interruption_code) 
#endif

#endif

		} else

		} else

			signal = SIGILL;

			signal = SIGILL;

	} else

	} else {

		/*

		 * If we get an illegal op in kernel mode, send it through the

		 * kprobes notifier. If kprobes doesn't pick it up, SIGILL

		 */

		if (notify_die(DIE_BPT, "bpt", regs, interruption_code,

			       3, SIGTRAP) != NOTIFY_STOP)

			signal = SIGILL;

			signal = SIGILL;

	}





#ifdef CONFIG_MATHEMU

#ifdef CONFIG_MATHEMU

        if (signal == SIGFPE)

        if (signal == SIGFPE)