signal: Use dedicated helpers to send signals with si_trapno set

Now that si_trapno is no longer expected to be present for every fault
reported using siginfo on alpha and sparc remove the trapno parameter
from force_sig_fault, force_sig_fault_to_task and send_sig_fault.

Add two new helpers force_sig_fault_trapno and send_sig_fautl_trapno
for those signals where trapno is expected to be set.

v1: https://lkml.kernel.org/r/m1eeers7q7.fsf_-_@fess.ebiederm.org
Link: https://lkml.kernel.org/r/20210505141101.11519-7-ebiederm@xmission.com
Reviewed-by: Marco Elver <elver@google.com>
Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com>

diff --git a/arch/alpha/kernel/osf_sys.c b/arch/alpha/kernel/osf_sys.c
index d5367a1c6300c1f6e62b95635cc5e37770b6265a..80c5d7fbe66a51f98570e1630a05fcf05c949875 100644 (file)
--- a/arch/alpha/kernel/osf_sys.c
+++ b/arch/alpha/kernel/osf_sys.c
@@ -878,7 +878,7 @@ SYSCALL_DEFINE5(osf_setsysinfo, unsigned long, op, void __user *, buffer,
 
                        send_sig_fault(SIGFPE, si_code,
                                       (void __user *)NULL,  /* FIXME */
-                                      0, current);
+                                      current);
                }
                return 0;
        }

diff --git a/arch/alpha/kernel/signal.c b/arch/alpha/kernel/signal.c
index 948b89789da82ace0ed16151ac8f94b747c4d625..bc077babafab56cea955cab3387a95d098715267 100644 (file)
--- a/arch/alpha/kernel/signal.c
+++ b/arch/alpha/kernel/signal.c
@@ -219,7 +219,7 @@ do_sigreturn(struct sigcontext __user *sc)
 
        /* Send SIGTRAP if we're single-stepping: */
        if (ptrace_cancel_bpt (current)) {
-               send_sig_fault(SIGTRAP, TRAP_BRKPT, (void __user *) regs->pc, 0,
+               send_sig_fault(SIGTRAP, TRAP_BRKPT, (void __user *) regs->pc,
                               current);
        }
        return;
@@ -247,7 +247,7 @@ do_rt_sigreturn(struct rt_sigframe __user *frame)
 
        /* Send SIGTRAP if we're single-stepping: */
        if (ptrace_cancel_bpt (current)) {
-               send_sig_fault(SIGTRAP, TRAP_BRKPT, (void __user *) regs->pc, 0,
+               send_sig_fault(SIGTRAP, TRAP_BRKPT, (void __user *) regs->pc,
                               current);
        }
        return;

diff --git a/arch/alpha/kernel/traps.c b/arch/alpha/kernel/traps.c
index 921d4b6e4d956185e6dbb7c3dd06f18f47b84bd7..0dddf9ecc1f484bbd5ed7e6c37f92f8238ca29de 100644 (file)
--- a/arch/alpha/kernel/traps.c
+++ b/arch/alpha/kernel/traps.c
@@ -227,7 +227,7 @@ do_entArith(unsigned long summary, unsigned long write_mask,
        }
        die_if_kernel("Arithmetic fault", regs, 0, NULL);
 
-       send_sig_fault(SIGFPE, si_code, (void __user *) regs->pc, 0, current);
+       send_sig_fault_trapno(SIGFPE, si_code, (void __user *) regs->pc, 0, current);
 }
 
 asmlinkage void
@@ -268,12 +268,12 @@ do_entIF(unsigned long type, struct pt_regs *regs)
                        regs->pc -= 4;  /* make pc point to former bpt */
                }
 
-               send_sig_fault(SIGTRAP, TRAP_BRKPT, (void __user *)regs->pc, 0,
+               send_sig_fault(SIGTRAP, TRAP_BRKPT, (void __user *)regs->pc,
                               current);
                return;
 
              case 1: /* bugcheck */
-               send_sig_fault(SIGTRAP, TRAP_UNK, (void __user *) regs->pc, 0,
+               send_sig_fault(SIGTRAP, TRAP_UNK, (void __user *) regs->pc,
                               current);
                return;
                
@@ -335,8 +335,8 @@ do_entIF(unsigned long type, struct pt_regs *regs)
                        break;
                }
 
-               send_sig_fault(signo, code, (void __user *) regs->pc, regs->r16,
-                              current);
+               send_sig_fault_trapno(signo, code, (void __user *) regs->pc,
+                                     regs->r16, current);
                return;
 
              case 4: /* opDEC */
@@ -360,9 +360,9 @@ do_entIF(unsigned long type, struct pt_regs *regs)
                        if (si_code == 0)
                                return;
                        if (si_code > 0) {
-                               send_sig_fault(SIGFPE, si_code,
-                                              (void __user *) regs->pc, 0,
-                                              current);
+                               send_sig_fault_trapno(SIGFPE, si_code,
+                                                     (void __user *) regs->pc,
+                                                     0, current);
                                return;
                        }
                }
@@ -387,7 +387,7 @@ do_entIF(unsigned long type, struct pt_regs *regs)
                      ;
        }
 
-       send_sig_fault(SIGILL, ILL_ILLOPC, (void __user *)regs->pc, 0, current);
+       send_sig_fault(SIGILL, ILL_ILLOPC, (void __user *)regs->pc, current);
 }
 
 /* There is an ifdef in the PALcode in MILO that enables a 
@@ -402,7 +402,7 @@ do_entDbg(struct pt_regs *regs)
 {
        die_if_kernel("Instruction fault", regs, 0, NULL);
 
-       force_sig_fault(SIGILL, ILL_ILLOPC, (void __user *)regs->pc, 0);
+       force_sig_fault(SIGILL, ILL_ILLOPC, (void __user *)regs->pc);
 }
 
 
@@ -964,12 +964,12 @@ give_sigsegv:
                        si_code = SEGV_MAPERR;
                mmap_read_unlock(mm);
        }
-       send_sig_fault(SIGSEGV, si_code, va, 0, current);
+       send_sig_fault(SIGSEGV, si_code, va, current);
        return;
 
 give_sigbus:
        regs->pc -= 4;
-       send_sig_fault(SIGBUS, BUS_ADRALN, va, 0, current);
+       send_sig_fault(SIGBUS, BUS_ADRALN, va, current);
        return;
 }
 

diff --git a/arch/alpha/mm/fault.c b/arch/alpha/mm/fault.c
index 09172f017efc0fc7122e99300b96c5353c2dd343..eee5102c3d8897200545314e88cc664e3e33d1ac 100644 (file)
--- a/arch/alpha/mm/fault.c
+++ b/arch/alpha/mm/fault.c
@@ -219,13 +219,13 @@ retry:
        mmap_read_unlock(mm);
        /* Send a sigbus, regardless of whether we were in kernel
           or user mode.  */
-       force_sig_fault(SIGBUS, BUS_ADRERR, (void __user *) address, 0);
+       force_sig_fault(SIGBUS, BUS_ADRERR, (void __user *) address);
        if (!user_mode(regs))
                goto no_context;
        return;
 
  do_sigsegv:
-       force_sig_fault(SIGSEGV, si_code, (void __user *) address, 0);
+       force_sig_fault(SIGSEGV, si_code, (void __user *) address);
        return;
 
 #ifdef CONFIG_ALPHA_LARGE_VMALLOC

diff --git a/arch/sparc/kernel/process_64.c b/arch/sparc/kernel/process_64.c
index 7afd0a859a78c8aa0389de0e6409df7defa7adc7..29e67854d5a47705dcda4b165258cf0f27ac3e26 100644 (file)
--- a/arch/sparc/kernel/process_64.c
+++ b/arch/sparc/kernel/process_64.c
@@ -518,7 +518,7 @@ void synchronize_user_stack(void)
 
 static void stack_unaligned(unsigned long sp)
 {
-       force_sig_fault(SIGBUS, BUS_ADRALN, (void __user *) sp, 0);
+       force_sig_fault(SIGBUS, BUS_ADRALN, (void __user *) sp);
 }
 
 static const char uwfault32[] = KERN_INFO \

diff --git a/arch/sparc/kernel/sys_sparc_32.c b/arch/sparc/kernel/sys_sparc_32.c
index be77538bc0387d42ab3b6fea5eaff6bfaac47f92..082a551897ed8f35636299dc7ed84906a74860ef 100644 (file)
--- a/arch/sparc/kernel/sys_sparc_32.c
+++ b/arch/sparc/kernel/sys_sparc_32.c
@@ -151,7 +151,7 @@ sparc_breakpoint (struct pt_regs *regs)
 #ifdef DEBUG_SPARC_BREAKPOINT
         printk ("TRAP: Entering kernel PC=%x, nPC=%x\n", regs->pc, regs->npc);
 #endif
-       force_sig_fault(SIGTRAP, TRAP_BRKPT, (void __user *)regs->pc, 0);
+       force_sig_fault(SIGTRAP, TRAP_BRKPT, (void __user *)regs->pc);
 
 #ifdef DEBUG_SPARC_BREAKPOINT
        printk ("TRAP: Returning to space: PC=%x nPC=%x\n", regs->pc, regs->npc);

diff --git a/arch/sparc/kernel/sys_sparc_64.c b/arch/sparc/kernel/sys_sparc_64.c
index 6b92fadb6ec7dd7844ad44e7b3ec3860d5e51e0a..1e9a9e016237bfe621223a43c458bf42e50cfdba 100644 (file)
--- a/arch/sparc/kernel/sys_sparc_64.c
+++ b/arch/sparc/kernel/sys_sparc_64.c
@@ -514,7 +514,7 @@ asmlinkage void sparc_breakpoint(struct pt_regs *regs)
 #ifdef DEBUG_SPARC_BREAKPOINT
         printk ("TRAP: Entering kernel PC=%lx, nPC=%lx\n", regs->tpc, regs->tnpc);
 #endif
-       force_sig_fault(SIGTRAP, TRAP_BRKPT, (void __user *)regs->tpc, 0);
+       force_sig_fault(SIGTRAP, TRAP_BRKPT, (void __user *)regs->tpc);
 #ifdef DEBUG_SPARC_BREAKPOINT
        printk ("TRAP: Returning to space: PC=%lx nPC=%lx\n", regs->tpc, regs->tnpc);
 #endif

diff --git a/arch/sparc/kernel/traps_32.c b/arch/sparc/kernel/traps_32.c
index 247a0d9683b2bcfc184c0d1af0314cff27c5ce01..5630e5a395e0d463ba072fb4dd47330e76d565e1 100644 (file)
--- a/arch/sparc/kernel/traps_32.c
+++ b/arch/sparc/kernel/traps_32.c
@@ -102,8 +102,8 @@ void do_hw_interrupt(struct pt_regs *regs, unsigned long type)
        if(regs->psr & PSR_PS)
                die_if_kernel("Kernel bad trap", regs);
 
-       force_sig_fault(SIGILL, ILL_ILLTRP,
-                       (void __user *)regs->pc, type - 0x80);
+       force_sig_fault_trapno(SIGILL, ILL_ILLTRP,
+                              (void __user *)regs->pc, type - 0x80);
 }
 
 void do_illegal_instruction(struct pt_regs *regs, unsigned long pc, unsigned long npc,
@@ -116,7 +116,7 @@ void do_illegal_instruction(struct pt_regs *regs, unsigned long pc, unsigned lon
               regs->pc, *(unsigned long *)regs->pc);
 #endif
 
-       send_sig_fault(SIGILL, ILL_ILLOPC, (void __user *)pc, 0, current);
+       send_sig_fault(SIGILL, ILL_ILLOPC, (void __user *)pc, current);
 }
 
 void do_priv_instruction(struct pt_regs *regs, unsigned long pc, unsigned long npc,
@@ -124,7 +124,7 @@ void do_priv_instruction(struct pt_regs *regs, unsigned long pc, unsigned long n
 {
        if(psr & PSR_PS)
                die_if_kernel("Penguin instruction from Penguin mode??!?!", regs);
-       send_sig_fault(SIGILL, ILL_PRVOPC, (void __user *)pc, 0, current);
+       send_sig_fault(SIGILL, ILL_PRVOPC, (void __user *)pc, current);
 }
 
 /* XXX User may want to be allowed to do this. XXX */
@@ -145,7 +145,7 @@ void do_memaccess_unaligned(struct pt_regs *regs, unsigned long pc, unsigned lon
 #endif
        send_sig_fault(SIGBUS, BUS_ADRALN,
                       /* FIXME: Should dig out mna address */ (void *)0,
-                      0, current);
+                      current);
 }
 
 static unsigned long init_fsr = 0x0UL;
@@ -291,7 +291,7 @@ void do_fpe_trap(struct pt_regs *regs, unsigned long pc, unsigned long npc,
                else if (fsr & 0x01)
                        code = FPE_FLTRES;
        }
-       send_sig_fault(SIGFPE, code, (void __user *)pc, 0, fpt);
+       send_sig_fault(SIGFPE, code, (void __user *)pc, fpt);
 #ifndef CONFIG_SMP
        last_task_used_math = NULL;
 #endif
@@ -305,7 +305,7 @@ void handle_tag_overflow(struct pt_regs *regs, unsigned long pc, unsigned long n
 {
        if(psr & PSR_PS)
                die_if_kernel("Penguin overflow trap from kernel mode", regs);
-       send_sig_fault(SIGEMT, EMT_TAGOVF, (void __user *)pc, 0, current);
+       send_sig_fault(SIGEMT, EMT_TAGOVF, (void __user *)pc, current);
 }
 
 void handle_watchpoint(struct pt_regs *regs, unsigned long pc, unsigned long npc,
@@ -327,13 +327,13 @@ void handle_reg_access(struct pt_regs *regs, unsigned long pc, unsigned long npc
        printk("Register Access Exception at PC %08lx NPC %08lx PSR %08lx\n",
               pc, npc, psr);
 #endif
-       force_sig_fault(SIGBUS, BUS_OBJERR, (void __user *)pc, 0);
+       force_sig_fault(SIGBUS, BUS_OBJERR, (void __user *)pc);
 }
 
 void handle_cp_disabled(struct pt_regs *regs, unsigned long pc, unsigned long npc,
                        unsigned long psr)
 {
-       send_sig_fault(SIGILL, ILL_COPROC, (void __user *)pc, 0, current);
+       send_sig_fault(SIGILL, ILL_COPROC, (void __user *)pc, current);
 }
 
 void handle_cp_exception(struct pt_regs *regs, unsigned long pc, unsigned long npc,
@@ -343,13 +343,13 @@ void handle_cp_exception(struct pt_regs *regs, unsigned long pc, unsigned long n
        printk("Co-Processor Exception at PC %08lx NPC %08lx PSR %08lx\n",
               pc, npc, psr);
 #endif
-       send_sig_fault(SIGILL, ILL_COPROC, (void __user *)pc, 0, current);
+       send_sig_fault(SIGILL, ILL_COPROC, (void __user *)pc, current);
 }
 
 void handle_hw_divzero(struct pt_regs *regs, unsigned long pc, unsigned long npc,
                       unsigned long psr)
 {
-       send_sig_fault(SIGFPE, FPE_INTDIV, (void __user *)pc, 0, current);
+       send_sig_fault(SIGFPE, FPE_INTDIV, (void __user *)pc, current);
 }
 
 #ifdef CONFIG_DEBUG_BUGVERBOSE

diff --git a/arch/sparc/kernel/traps_64.c b/arch/sparc/kernel/traps_64.c
index a850dccd78ea19c8a9e30f9140884d3d0091b82a..6863025ed56d272343f3ee6d2b34d50c5349c213 100644 (file)
--- a/arch/sparc/kernel/traps_64.c
+++ b/arch/sparc/kernel/traps_64.c
@@ -107,8 +107,8 @@ void bad_trap(struct pt_regs *regs, long lvl)
                regs->tpc &= 0xffffffff;
                regs->tnpc &= 0xffffffff;
        }
-       force_sig_fault(SIGILL, ILL_ILLTRP,
-                       (void __user *)regs->tpc, lvl);
+       force_sig_fault_trapno(SIGILL, ILL_ILLTRP,
+                              (void __user *)regs->tpc, lvl);
 }
 
 void bad_trap_tl1(struct pt_regs *regs, long lvl)
@@ -201,8 +201,7 @@ void spitfire_insn_access_exception(struct pt_regs *regs, unsigned long sfsr, un
                regs->tpc &= 0xffffffff;
                regs->tnpc &= 0xffffffff;
        }
-       force_sig_fault(SIGSEGV, SEGV_MAPERR,
-                       (void __user *)regs->tpc, 0);
+       force_sig_fault(SIGSEGV, SEGV_MAPERR, (void __user *)regs->tpc);
 out:
        exception_exit(prev_state);
 }
@@ -237,7 +236,7 @@ void sun4v_insn_access_exception(struct pt_regs *regs, unsigned long addr, unsig
                regs->tpc &= 0xffffffff;
                regs->tnpc &= 0xffffffff;
        }
-       force_sig_fault(SIGSEGV, SEGV_MAPERR, (void __user *) addr, 0);
+       force_sig_fault(SIGSEGV, SEGV_MAPERR, (void __user *) addr);
 }
 
 void sun4v_insn_access_exception_tl1(struct pt_regs *regs, unsigned long addr, unsigned long type_ctx)
@@ -321,7 +320,7 @@ void spitfire_data_access_exception(struct pt_regs *regs, unsigned long sfsr, un
        if (is_no_fault_exception(regs))
                return;
 
-       force_sig_fault(SIGSEGV, SEGV_MAPERR, (void __user *)sfar, 0);
+       force_sig_fault(SIGSEGV, SEGV_MAPERR, (void __user *)sfar);
 out:
        exception_exit(prev_state);
 }
@@ -385,13 +384,13 @@ void sun4v_data_access_exception(struct pt_regs *regs, unsigned long addr, unsig
         */
        switch (type) {
        case HV_FAULT_TYPE_INV_ASI:
-               force_sig_fault(SIGILL, ILL_ILLADR, (void __user *)addr, 0);
+               force_sig_fault(SIGILL, ILL_ILLADR, (void __user *)addr);
                break;
        case HV_FAULT_TYPE_MCD_DIS:
-               force_sig_fault(SIGSEGV, SEGV_ACCADI, (void __user *)addr, 0);
+               force_sig_fault(SIGSEGV, SEGV_ACCADI, (void __user *)addr);
                break;
        default:
-               force_sig_fault(SIGSEGV, SEGV_MAPERR, (void __user *)addr, 0);
+               force_sig_fault(SIGSEGV, SEGV_MAPERR, (void __user *)addr);
                break;
        }
 }
@@ -568,7 +567,7 @@ static void spitfire_ue_log(unsigned long afsr, unsigned long afar, unsigned lon
                regs->tpc &= 0xffffffff;
                regs->tnpc &= 0xffffffff;
        }
-       force_sig_fault(SIGBUS, BUS_OBJERR, (void *)0, 0);
+       force_sig_fault(SIGBUS, BUS_OBJERR, (void *)0);
 }
 
 void spitfire_access_error(struct pt_regs *regs, unsigned long status_encoded, unsigned long afar)
@@ -2069,8 +2068,7 @@ void do_mcd_err(struct pt_regs *regs, struct sun4v_error_entry ent)
        /* Send SIGSEGV to the userspace process with the right signal
         * code
         */
-       force_sig_fault(SIGSEGV, SEGV_ADIDERR, (void __user *)ent.err_raddr,
-                       0);
+       force_sig_fault(SIGSEGV, SEGV_ADIDERR, (void __user *)ent.err_raddr);
 }
 
 /* We run with %pil set to PIL_NORMAL_MAX and PSTATE_IE enabled in %pstate.
@@ -2184,7 +2182,7 @@ bool sun4v_nonresum_error_user_handled(struct pt_regs *regs,
        }
        if (attrs & SUN4V_ERR_ATTRS_PIO) {
                force_sig_fault(SIGBUS, BUS_ADRERR,
-                               (void __user *)sun4v_get_vaddr(regs), 0);
+                               (void __user *)sun4v_get_vaddr(regs));
                return true;
        }
 
@@ -2340,8 +2338,7 @@ static void do_fpe_common(struct pt_regs *regs)
                        else if (fsr & 0x01)
                                code = FPE_FLTRES;
                }
-               force_sig_fault(SIGFPE, code,
-                               (void __user *)regs->tpc, 0);
+               force_sig_fault(SIGFPE, code, (void __user *)regs->tpc);
        }
 }
 
@@ -2395,8 +2392,7 @@ void do_tof(struct pt_regs *regs)
                regs->tpc &= 0xffffffff;
                regs->tnpc &= 0xffffffff;
        }
-       force_sig_fault(SIGEMT, EMT_TAGOVF,
-                       (void __user *)regs->tpc, 0);
+       force_sig_fault(SIGEMT, EMT_TAGOVF, (void __user *)regs->tpc);
 out:
        exception_exit(prev_state);
 }
@@ -2415,8 +2411,7 @@ void do_div0(struct pt_regs *regs)
                regs->tpc &= 0xffffffff;
                regs->tnpc &= 0xffffffff;
        }
-       force_sig_fault(SIGFPE, FPE_INTDIV,
-                       (void __user *)regs->tpc, 0);
+       force_sig_fault(SIGFPE, FPE_INTDIV, (void __user *)regs->tpc);
 out:
        exception_exit(prev_state);
 }
@@ -2612,7 +2607,7 @@ void do_illegal_instruction(struct pt_regs *regs)
                        }
                }
        }
-       force_sig_fault(SIGILL, ILL_ILLOPC, (void __user *)pc, 0);
+       force_sig_fault(SIGILL, ILL_ILLOPC, (void __user *)pc);
 out:
        exception_exit(prev_state);
 }
@@ -2632,7 +2627,7 @@ void mem_address_unaligned(struct pt_regs *regs, unsigned long sfar, unsigned lo
        if (is_no_fault_exception(regs))
                return;
 
-       force_sig_fault(SIGBUS, BUS_ADRALN, (void __user *)sfar, 0);
+       force_sig_fault(SIGBUS, BUS_ADRALN, (void __user *)sfar);
 out:
        exception_exit(prev_state);
 }
@@ -2650,7 +2645,7 @@ void sun4v_do_mna(struct pt_regs *regs, unsigned long addr, unsigned long type_c
        if (is_no_fault_exception(regs))
                return;
 
-       force_sig_fault(SIGBUS, BUS_ADRALN, (void __user *) addr, 0);
+       force_sig_fault(SIGBUS, BUS_ADRALN, (void __user *) addr);
 }
 
 /* sun4v_mem_corrupt_detect_precise() - Handle precise exception on an ADI
@@ -2697,7 +2692,7 @@ void sun4v_mem_corrupt_detect_precise(struct pt_regs *regs, unsigned long addr,
                regs->tpc &= 0xffffffff;
                regs->tnpc &= 0xffffffff;
        }
-       force_sig_fault(SIGSEGV, SEGV_ADIPERR, (void __user *)addr, 0);
+       force_sig_fault(SIGSEGV, SEGV_ADIPERR, (void __user *)addr);
 }
 
 void do_privop(struct pt_regs *regs)
@@ -2712,8 +2707,7 @@ void do_privop(struct pt_regs *regs)
                regs->tpc &= 0xffffffff;
                regs->tnpc &= 0xffffffff;
        }
-       force_sig_fault(SIGILL, ILL_PRVOPC,
-                       (void __user *)regs->tpc, 0);
+       force_sig_fault(SIGILL, ILL_PRVOPC, (void __user *)regs->tpc);
 out:
        exception_exit(prev_state);
 }

diff --git a/arch/sparc/kernel/unaligned_32.c b/arch/sparc/kernel/unaligned_32.c
index ef5c5207c9ffbbee5ef2b339cb0d073d1cc55d2a..455f0258c745e60203c5e6109ef82bf9a8219e19 100644 (file)
--- a/arch/sparc/kernel/unaligned_32.c
+++ b/arch/sparc/kernel/unaligned_32.c
@@ -278,5 +278,5 @@ asmlinkage void user_unaligned_trap(struct pt_regs *regs, unsigned int insn)
 {
        send_sig_fault(SIGBUS, BUS_ADRALN,
                       (void __user *)safe_compute_effective_address(regs, insn),
-                      0, current);
+                      current);
 }

diff --git a/arch/sparc/mm/fault_32.c b/arch/sparc/mm/fault_32.c
index de2031c2b2d7982ebe39af78654e463c1cbfc5cd..fa858626b85b6d40d523e6e624dbdeac6150f9bc 100644 (file)
--- a/arch/sparc/mm/fault_32.c
+++ b/arch/sparc/mm/fault_32.c
@@ -83,7 +83,7 @@ static void __do_fault_siginfo(int code, int sig, struct pt_regs *regs,
                show_signal_msg(regs, sig, code,
                                addr, current);
 
-       force_sig_fault(sig, code, (void __user *) addr, 0);
+       force_sig_fault(sig, code, (void __user *) addr);
 }
 
 static unsigned long compute_si_addr(struct pt_regs *regs, int text_fault)

diff --git a/arch/sparc/mm/fault_64.c b/arch/sparc/mm/fault_64.c
index 0a6bcc85fba717dcc190963dc6388b108af795a3..9a9652a15fed1de2b716200fc8272b2e134ef62e 100644 (file)
--- a/arch/sparc/mm/fault_64.c
+++ b/arch/sparc/mm/fault_64.c
@@ -176,7 +176,7 @@ static void do_fault_siginfo(int code, int sig, struct pt_regs *regs,
        if (unlikely(show_unhandled_signals))
                show_signal_msg(regs, sig, code, addr, current);
 
-       force_sig_fault(sig, code, (void __user *) addr, 0);
+       force_sig_fault(sig, code, (void __user *) addr);
 }
 
 static unsigned int get_fault_insn(struct pt_regs *regs, unsigned int insn)

diff --git a/include/linux/sched/signal.h b/include/linux/sched/signal.h
index 3f6a0fcaa10cf47050a79f366a1371613178c8df..7daa425f30556393160e8fbf46a790cd27db5a07 100644 (file)
--- a/include/linux/sched/signal.h
+++ b/include/linux/sched/signal.h
@@ -298,11 +298,6 @@ static inline void kernel_signal_stop(void)
 
        schedule();
 }
-#ifdef __ARCH_SI_TRAPNO
-# define ___ARCH_SI_TRAPNO(_a1) , _a1
-#else
-# define ___ARCH_SI_TRAPNO(_a1)
-#endif
 #ifdef __ia64__
 # define ___ARCH_SI_IA64(_a1, _a2, _a3) , _a1, _a2, _a3
 #else
@@ -310,14 +305,11 @@ static inline void kernel_signal_stop(void)
 #endif
 
 int force_sig_fault_to_task(int sig, int code, void __user *addr
-       ___ARCH_SI_TRAPNO(int trapno)
        ___ARCH_SI_IA64(int imm, unsigned int flags, unsigned long isr)
        , struct task_struct *t);
 int force_sig_fault(int sig, int code, void __user *addr
-       ___ARCH_SI_TRAPNO(int trapno)
        ___ARCH_SI_IA64(int imm, unsigned int flags, unsigned long isr));
 int send_sig_fault(int sig, int code, void __user *addr
-       ___ARCH_SI_TRAPNO(int trapno)
        ___ARCH_SI_IA64(int imm, unsigned int flags, unsigned long isr)
        , struct task_struct *t);
 
@@ -327,6 +319,10 @@ int send_sig_mceerr(int code, void __user *, short, struct task_struct *);
 int force_sig_bnderr(void __user *addr, void __user *lower, void __user *upper);
 int force_sig_pkuerr(void __user *addr, u32 pkey);
 
+int force_sig_fault_trapno(int sig, int code, void __user *addr, int trapno);
+int send_sig_fault_trapno(int sig, int code, void __user *addr, int trapno,
+                         struct task_struct *task);
+
 int force_sig_ptrace_errno_trap(int errno, void __user *addr);
 
 extern int send_sig_info(int, struct kernel_siginfo *, struct task_struct *);

diff --git a/kernel/signal.c b/kernel/signal.c
index 3d3ba794978805b5dd9318b628a38b311c5a2ef9..7eaa8d84db4cb5cedcc567edd8305660611147ed 100644 (file)
--- a/kernel/signal.c
+++ b/kernel/signal.c
@@ -1651,7 +1651,6 @@ void force_sigsegv(int sig)
 }
 
 int force_sig_fault_to_task(int sig, int code, void __user *addr
-       ___ARCH_SI_TRAPNO(int trapno)
        ___ARCH_SI_IA64(int imm, unsigned int flags, unsigned long isr)
        , struct task_struct *t)
 {
@@ -1662,9 +1661,6 @@ int force_sig_fault_to_task(int sig, int code, void __user *addr
        info.si_errno = 0;
        info.si_code  = code;
        info.si_addr  = addr;
-#ifdef __ARCH_SI_TRAPNO
-       info.si_trapno = trapno;
-#endif
 #ifdef __ia64__
        info.si_imm = imm;
        info.si_flags = flags;
@@ -1674,16 +1670,13 @@ int force_sig_fault_to_task(int sig, int code, void __user *addr
 }
 
 int force_sig_fault(int sig, int code, void __user *addr
-       ___ARCH_SI_TRAPNO(int trapno)
        ___ARCH_SI_IA64(int imm, unsigned int flags, unsigned long isr))
 {
        return force_sig_fault_to_task(sig, code, addr
-                                      ___ARCH_SI_TRAPNO(trapno)
                                       ___ARCH_SI_IA64(imm, flags, isr), current);
 }
 
 int send_sig_fault(int sig, int code, void __user *addr
-       ___ARCH_SI_TRAPNO(int trapno)
        ___ARCH_SI_IA64(int imm, unsigned int flags, unsigned long isr)
        , struct task_struct *t)
 {
@@ -1694,9 +1687,6 @@ int send_sig_fault(int sig, int code, void __user *addr
        info.si_errno = 0;
        info.si_code  = code;
        info.si_addr  = addr;
-#ifdef __ARCH_SI_TRAPNO
-       info.si_trapno = trapno;
-#endif
 #ifdef __ia64__
        info.si_imm = imm;
        info.si_flags = flags;
@@ -1763,6 +1753,37 @@ int force_sig_pkuerr(void __user *addr, u32 pkey)
 }
 #endif
 
+#if IS_ENABLED(CONFIG_SPARC)
+int force_sig_fault_trapno(int sig, int code, void __user *addr, int trapno)
+{
+       struct kernel_siginfo info;
+
+       clear_siginfo(&info);
+       info.si_signo = sig;
+       info.si_errno = 0;
+       info.si_code  = code;
+       info.si_addr  = addr;
+       info.si_trapno = trapno;
+       return force_sig_info(&info);
+}
+#endif
+
+#if IS_ENABLED(CONFIG_ALPHA)
+int send_sig_fault_trapno(int sig, int code, void __user *addr, int trapno,
+                         struct task_struct *t)
+{
+       struct kernel_siginfo info;
+
+       clear_siginfo(&info);
+       info.si_signo = sig;
+       info.si_errno = 0;
+       info.si_code  = code;
+       info.si_addr  = addr;
+       info.si_trapno = trapno;
+       return send_sig_info(info.si_signo, &info, t);
+}
+#endif
+
 /* For the crazy architectures that include trap information in
  * the errno field, instead of an actual errno value.
  */