1 files changed, 22 insertions, 26 deletions

diff --git a/arch/arm64/kernel/debug-monitors.c b/arch/arm64/kernel/debug-monitors.c
index 8aee3aeec3e6..c536c9e307b9 100644
--- a/arch/arm64/kernel/debug-monitors.c
+++ b/arch/arm64/kernel/debug-monitors.c
@@ -226,11 +226,28 @@ static int call_step_hook(struct pt_regs *regs, unsigned int esr)
         return retval;
 }
 
+static void send_user_sigtrap(int si_code)
+{
+        struct pt_regs *regs = current_pt_regs();
+        siginfo_t info = {
+                .si_signo       = SIGTRAP,
+                .si_errno       = 0,
+                .si_code        = si_code,
+                .si_addr        = (void __user *)instruction_pointer(regs),
+        };
+
+        if (WARN_ON(!user_mode(regs)))
+                return;
+
+        if (interrupts_enabled(regs))
+                local_irq_enable();
+
+        force_sig_info(SIGTRAP, &info, current);
+}
+
 static int single_step_handler(unsigned long addr, unsigned int esr,
                                struct pt_regs *regs)
 {
-        siginfo_t info;
-
         /*
          * If we are stepping a pending breakpoint, call the hw_breakpoint
          * handler first.
@@ -239,11 +256,7 @@ static int single_step_handler(unsigned long addr, unsigned int esr,
                 return 0;
 
         if (user_mode(regs)) {
-                info.si_signo = SIGTRAP;
-                info.si_errno = 0;
-                info.si_code  = TRAP_HWBKPT;
-                info.si_addr  = (void __user *)instruction_pointer(regs);
-                force_sig_info(SIGTRAP, &info, current);
+                send_user_sigtrap(TRAP_HWBKPT);
 
                 /*
                  * ptrace will disable single step unless explicitly
@@ -307,17 +320,8 @@ static int call_break_hook(struct pt_regs *regs, unsigned int esr)
 static int brk_handler(unsigned long addr, unsigned int esr,
                        struct pt_regs *regs)
 {
-        siginfo_t info;
-
         if (user_mode(regs)) {
-                info = (siginfo_t) {
-                        .si_signo = SIGTRAP,
-                        .si_errno = 0,
-                        .si_code  = TRAP_BRKPT,
-                        .si_addr  = (void __user *)instruction_pointer(regs),
-                };
-
-                force_sig_info(SIGTRAP, &info, current);
+                send_user_sigtrap(TRAP_BRKPT);
         } else if (call_break_hook(regs, esr) != DBG_HOOK_HANDLED) {
                 pr_warning("Unexpected kernel BRK exception at EL1\n");
                 return -EFAULT;
@@ -328,7 +332,6 @@ static int brk_handler(unsigned long addr, unsigned int esr,
 
 int aarch32_break_handler(struct pt_regs *regs)
 {
-        siginfo_t info;
         u32 arm_instr;
         u16 thumb_instr;
         bool bp = false;
@@ -359,14 +362,7 @@ int aarch32_break_handler(struct pt_regs *regs)
         if (!bp)
                 return -EFAULT;
 
-        info = (siginfo_t) {
-                .si_signo = SIGTRAP,
-                .si_errno = 0,
-                .si_code  = TRAP_BRKPT,
-                .si_addr  = pc,
-        };
-
-        force_sig_info(SIGTRAP, &info, current);
+        send_user_sigtrap(TRAP_BRKPT);
         return 0;
 }