|
@@ -18,7 +18,7 @@
|
|
|
#include <linux/kernel.h>
|
|
|
#include <linux/string.h>
|
|
|
#include <linux/errno.h>
|
|
|
-#include <linux/tracehook.h>
|
|
|
+#include <linux/ptrace.h>
|
|
|
#include <linux/timer.h>
|
|
|
#include <linux/mm.h>
|
|
|
#include <linux/smp.h>
|
|
@@ -325,10 +325,17 @@ static inline void __user *get_psw_address(struct pt_regs *regs,
|
|
|
|
|
|
void __kprobes do_per_trap(struct pt_regs *regs)
|
|
|
{
|
|
|
+ siginfo_t info;
|
|
|
+
|
|
|
if (notify_die(DIE_SSTEP, "sstep", regs, 0, 0, SIGTRAP) == NOTIFY_STOP)
|
|
|
return;
|
|
|
- if (current->ptrace)
|
|
|
- force_sig(SIGTRAP, current);
|
|
|
+ if (!current->ptrace)
|
|
|
+ return;
|
|
|
+ info.si_signo = SIGTRAP;
|
|
|
+ info.si_errno = 0;
|
|
|
+ info.si_code = TRAP_HWBKPT;
|
|
|
+ info.si_addr = (void *) current->thread.per_event.address;
|
|
|
+ force_sig_info(SIGTRAP, &info, current);
|
|
|
}
|
|
|
|
|
|
static void default_trap_handler(struct pt_regs *regs, long pgm_int_code,
|
|
@@ -421,9 +428,13 @@ static void __kprobes illegal_op(struct pt_regs *regs, long pgm_int_code,
|
|
|
if (get_user(*((__u16 *) opcode), (__u16 __user *) location))
|
|
|
return;
|
|
|
if (*((__u16 *) opcode) == S390_BREAKPOINT_U16) {
|
|
|
- if (current->ptrace)
|
|
|
- force_sig(SIGTRAP, current);
|
|
|
- else
|
|
|
+ if (current->ptrace) {
|
|
|
+ info.si_signo = SIGTRAP;
|
|
|
+ info.si_errno = 0;
|
|
|
+ info.si_code = TRAP_BRKPT;
|
|
|
+ info.si_addr = location;
|
|
|
+ force_sig_info(SIGTRAP, &info, current);
|
|
|
+ } else
|
|
|
signal = SIGILL;
|
|
|
#ifdef CONFIG_MATHEMU
|
|
|
} else if (opcode[0] == 0xb3) {
|