Merge branch 'siginfo-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace

Pull force_sig() argument change from Eric Biederman:
 "A source of error over the years has been that force_sig has taken a
  task parameter when it is only safe to use force_sig with the current
  task.

  The force_sig function is built for delivering synchronous signals
  such as SIGSEGV where the userspace application caused a synchronous
  fault (such as a page fault) and the kernel responded with a signal.

  Because the name force_sig does not make this clear, and because the
  force_sig takes a task parameter the function force_sig has been
  abused for sending other kinds of signals over the years. Slowly those
  have been fixed when the oopses have been tracked down.

  This set of changes fixes the remaining abusers of force_sig and
  carefully rips out the task parameter from force_sig and friends
  making this kind of error almost impossible in the future"

* 'siginfo-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace: (27 commits)
  signal/x86: Move tsk inside of CONFIG_MEMORY_FAILURE in do_sigbus
  signal: Remove the signal number and task parameters from force_sig_info
  signal: Factor force_sig_info_to_task out of force_sig_info
  signal: Generate the siginfo in force_sig
  signal: Move the computation of force into send_signal and correct it.
  signal: Properly set TRACE_SIGNAL_LOSE_INFO in __send_signal
  signal: Remove the task parameter from force_sig_fault
  signal: Use force_sig_fault_to_task for the two calls that don't deliver to current
  signal: Explicitly call force_sig_fault on current
  signal/unicore32: Remove tsk parameter from __do_user_fault
  signal/arm: Remove tsk parameter from __do_user_fault
  signal/arm: Remove tsk parameter from ptrace_break
  signal/nds32: Remove tsk parameter from send_sigtrap
  signal/riscv: Remove tsk parameter from do_trap
  signal/sh: Remove tsk parameter from force_sig_info_fault
  signal/um: Remove task parameter from send_sigtrap
  signal/x86: Remove task parameter from send_sigtrap
  signal: Remove task parameter from force_sig_mceerr
  signal: Remove task parameter from force_sig
  signal: Remove task parameter from force_sigsegv
  ...

5 files changed, 21 insertions, 21 deletions

diff --git a/arch/ia64/kernel/brl_emu.c b/arch/ia64/kernel/brl_emu.c
index c0239bf77a09..782c481d7052 100644
--- a/arch/ia64/kernel/brl_emu.c
+++ b/arch/ia64/kernel/brl_emu.c
@@ -197,21 +197,21 @@ ia64_emulate_brl (struct pt_regs *regs, unsigned long ar_ec)
                  */
                 printk(KERN_DEBUG "Woah! Unimplemented Instruction Address Trap!\n");
                 force_sig_fault(SIGILL, ILL_BADIADDR, (void __user *)NULL,
-                                0, 0, 0, current);
+                                0, 0, 0);
         } else if (ia64_psr(regs)->tb) {
                 /*
                  *  Branch Tracing is enabled.
                  *  Force a taken branch signal.
                  */
                 force_sig_fault(SIGTRAP, TRAP_BRANCH, (void __user *)NULL,
-                                0, 0, 0, current);
+                                0, 0, 0);
         } else if (ia64_psr(regs)->ss) {
                 /*
                  *  Single Step is enabled.
                  *  Force a trace signal.
                  */
                 force_sig_fault(SIGTRAP, TRAP_TRACE, (void __user *)NULL,
-                                0, 0, 0, current);
+                                0, 0, 0);
         }
         return rv;
 }
diff --git a/arch/ia64/kernel/signal.c b/arch/ia64/kernel/signal.c
index 6062fd14e34e..e5044aed9452 100644
--- a/arch/ia64/kernel/signal.c
+++ b/arch/ia64/kernel/signal.c
@@ -152,7 +152,7 @@ ia64_rt_sigreturn (struct sigscratch *scr)
         return retval;
 
   give_sigsegv:
-        force_sig(SIGSEGV, current);
+        force_sig(SIGSEGV);
         return retval;
 }
 
@@ -257,7 +257,7 @@ setup_frame(struct ksignal *ksig, sigset_t *set, struct sigscratch *scr)
                          */
                         check_sp = (new_sp - sizeof(*frame)) & -STACK_ALIGN;
                         if (!likely(on_sig_stack(check_sp))) {
-                                force_sigsegv(ksig->sig, current);
+                                force_sigsegv(ksig->sig);
                                 return 1;
                         }
                 }
@@ -265,7 +265,7 @@ setup_frame(struct ksignal *ksig, sigset_t *set, struct sigscratch *scr)
         frame = (void __user *) ((new_sp - sizeof(*frame)) & -STACK_ALIGN);
 
         if (!access_ok(frame, sizeof(*frame))) {
-                force_sigsegv(ksig->sig, current);
+                force_sigsegv(ksig->sig);
                 return 1;
         }
 
@@ -282,7 +282,7 @@ setup_frame(struct ksignal *ksig, sigset_t *set, struct sigscratch *scr)
         err |= setup_sigcontext(&frame->sc, set, scr);
 
         if (unlikely(err)) {
-                force_sigsegv(ksig->sig, current);
+                force_sigsegv(ksig->sig);
                 return 1;
         }
 
diff --git a/arch/ia64/kernel/traps.c b/arch/ia64/kernel/traps.c
index 85d8616ac4f6..e13cb905930f 100644
--- a/arch/ia64/kernel/traps.c
+++ b/arch/ia64/kernel/traps.c
@@ -176,7 +176,7 @@ __kprobes ia64_bad_break (unsigned long break_num, struct pt_regs *regs)
         }
         force_sig_fault(sig, code,
                         (void __user *) (regs->cr_iip + ia64_psr(regs)->ri),
-                        break_num, 0 /* clear __ISR_VALID */, 0, current);
+                        break_num, 0 /* clear __ISR_VALID */, 0);
 }
 
 /*
@@ -353,7 +353,7 @@ handle_fpu_swa (int fp_fault, struct pt_regs *regs, unsigned long isr)
                         }
                         force_sig_fault(SIGFPE, si_code,
                                         (void __user *) (regs->cr_iip + ia64_psr(regs)->ri),
-                                        0, __ISR_VALID, isr, current);
+                                        0, __ISR_VALID, isr);
                 }
         } else {
                 if (exception == -1) {
@@ -373,7 +373,7 @@ handle_fpu_swa (int fp_fault, struct pt_regs *regs, unsigned long isr)
                         }
                         force_sig_fault(SIGFPE, si_code,
                                         (void __user *) (regs->cr_iip + ia64_psr(regs)->ri),
-                                        0, __ISR_VALID, isr, current);
+                                        0, __ISR_VALID, isr);
                 }
         }
         return 0;
@@ -408,7 +408,7 @@ ia64_illegal_op_fault (unsigned long ec, long arg1, long arg2, long arg3,
 
         force_sig_fault(SIGILL, ILL_ILLOPC,
                         (void __user *) (regs.cr_iip + ia64_psr(&regs)->ri),
-                        0, 0, 0, current);
+                        0, 0, 0);
         return rv;
 }
 
@@ -483,7 +483,7 @@ ia64_fault (unsigned long vector, unsigned long isr, unsigned long ifa,
                                                         + ia64_psr(&regs)->ri);
                         }
                         force_sig_fault(sig, code, addr,
-                                        vector, __ISR_VALID, isr, current);
+                                        vector, __ISR_VALID, isr);
                         return;
                 } else if (ia64_done_with_exception(&regs))
                         return;
@@ -493,7 +493,7 @@ ia64_fault (unsigned long vector, unsigned long isr, unsigned long ifa,
               case 31: /* Unsupported Data Reference */
                 if (user_mode(&regs)) {
                         force_sig_fault(SIGILL, ILL_ILLOPN, (void __user *) iip,
-                                        vector, __ISR_VALID, isr, current);
+                                        vector, __ISR_VALID, isr);
                         return;
                 }
                 sprintf(buf, "Unsupported data reference");
@@ -542,7 +542,7 @@ ia64_fault (unsigned long vector, unsigned long isr, unsigned long ifa,
                                 == NOTIFY_STOP)
                         return;
                 force_sig_fault(SIGTRAP, si_code, (void __user *) ifa,
-                                0, __ISR_VALID, isr, current);
+                                0, __ISR_VALID, isr);
                 return;
 
               case 32: /* fp fault */
@@ -550,7 +550,7 @@ ia64_fault (unsigned long vector, unsigned long isr, unsigned long ifa,
                 result = handle_fpu_swa((vector == 32) ? 1 : 0, &regs, isr);
                 if ((result < 0) || (current->thread.flags & IA64_THREAD_FPEMU_SIGFPE)) {
                         force_sig_fault(SIGFPE, FPE_FLTINV, (void __user *) iip,
-                                        0, __ISR_VALID, isr, current);
+                                        0, __ISR_VALID, isr);
                 }
                 return;
 
@@ -578,7 +578,7 @@ ia64_fault (unsigned long vector, unsigned long isr, unsigned long ifa,
                         if (user_mode(&regs)) {
                                 force_sig_fault(SIGILL, ILL_BADIADDR,
                                                 (void __user *) iip,
-                                                0, 0, 0, current);
+                                                0, 0, 0);
                                 return;
                         }
                         sprintf(buf, "Unimplemented Instruction Address fault");
@@ -589,14 +589,14 @@ ia64_fault (unsigned long vector, unsigned long isr, unsigned long ifa,
                 printk(KERN_ERR "Unexpected IA-32 exception (Trap 45)\n");
                 printk(KERN_ERR "  iip - 0x%lx, ifa - 0x%lx, isr - 0x%lx\n",
                        iip, ifa, isr);
-                force_sig(SIGSEGV, current);
+                force_sig(SIGSEGV);
                 return;
 
               case 46:
                 printk(KERN_ERR "Unexpected IA-32 intercept trap (Trap 46)\n");
                 printk(KERN_ERR "  iip - 0x%lx, ifa - 0x%lx, isr - 0x%lx, iim - 0x%lx\n",
                        iip, ifa, isr, iim);
-                force_sig(SIGSEGV, current);
+                force_sig(SIGSEGV);
                 return;
 
               case 47:
@@ -608,5 +608,5 @@ ia64_fault (unsigned long vector, unsigned long isr, unsigned long ifa,
                 break;
         }
         if (!die_if_kernel(buf, &regs, error))
-                force_sig(SIGILL, current);
+                force_sig(SIGILL);
 }
diff --git a/arch/ia64/kernel/unaligned.c b/arch/ia64/kernel/unaligned.c
index a167a3824b35..eb7d5df59fa3 100644
--- a/arch/ia64/kernel/unaligned.c
+++ b/arch/ia64/kernel/unaligned.c
@@ -1537,6 +1537,6 @@ ia64_handle_unaligned (unsigned long ifa, struct pt_regs *regs)
         }
   force_sigbus:
         force_sig_fault(SIGBUS, BUS_ADRALN, (void __user *) ifa,
-                        0, 0, 0, current);
+                        0, 0, 0);
         goto done;
 }
diff --git a/arch/ia64/mm/fault.c b/arch/ia64/mm/fault.c
index 5baeb022f474..3c3a283d3172 100644
--- a/arch/ia64/mm/fault.c
+++ b/arch/ia64/mm/fault.c
@@ -249,7 +249,7 @@ retry:
         }
         if (user_mode(regs)) {
                 force_sig_fault(signal, code, (void __user *) address,
-                                0, __ISR_VALID, isr, current);
+                                0, __ISR_VALID, isr);
                 return;
         }