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
  ...

3 files changed, 14 insertions, 14 deletions

diff --git a/arch/m68k/kernel/signal.c b/arch/m68k/kernel/signal.c
index 87e7f3639839..05610e6924c1 100644
--- a/arch/m68k/kernel/signal.c
+++ b/arch/m68k/kernel/signal.c
@@ -803,7 +803,7 @@ asmlinkage int do_sigreturn(struct pt_regs *regs, struct switch_stack *sw)
         return regs->d0;
 
 badframe:
-        force_sig(SIGSEGV, current);
+        force_sig(SIGSEGV);
         return 0;
 }
 
@@ -825,7 +825,7 @@ asmlinkage int do_rt_sigreturn(struct pt_regs *regs, struct switch_stack *sw)
         return regs->d0;
 
 badframe:
-        force_sig(SIGSEGV, current);
+        force_sig(SIGSEGV);
         return 0;
 }
 
diff --git a/arch/m68k/kernel/traps.c b/arch/m68k/kernel/traps.c
index b2fd000b9285..344f93d36a9a 100644
--- a/arch/m68k/kernel/traps.c
+++ b/arch/m68k/kernel/traps.c
@@ -431,7 +431,7 @@ static inline void bus_error030 (struct frame *fp)
                         pr_err("BAD KERNEL BUSERR\n");
 
                         die_if_kernel("Oops", &fp->ptregs,0);
-                        force_sig(SIGKILL, current);
+                        force_sig(SIGKILL);
                         return;
                 }
         } else {
@@ -463,7 +463,7 @@ static inline void bus_error030 (struct frame *fp)
                                  !(ssw & RW) ? "write" : "read", addr,
                                  fp->ptregs.pc);
                         die_if_kernel ("Oops", &fp->ptregs, buserr_type);
-                        force_sig (SIGBUS, current);
+                        force_sig (SIGBUS);
                         return;
                 }
 
@@ -493,7 +493,7 @@ static inline void bus_error030 (struct frame *fp)
                         do_page_fault (&fp->ptregs, addr, 0);
        } else {
                 pr_debug("protection fault on insn access (segv).\n");
-                force_sig (SIGSEGV, current);
+                force_sig (SIGSEGV);
        }
 }
 #else
@@ -571,7 +571,7 @@ static inline void bus_error030 (struct frame *fp)
                                !(ssw & RW) ? "write" : "read", addr,
                                fp->ptregs.pc);
                         die_if_kernel("Oops",&fp->ptregs,mmusr);
-                        force_sig(SIGSEGV, current);
+                        force_sig(SIGSEGV);
                         return;
                 } else {
 #if 0
@@ -598,7 +598,7 @@ static inline void bus_error030 (struct frame *fp)
 #endif
                         pr_debug("Unknown SIGSEGV - 1\n");
                         die_if_kernel("Oops",&fp->ptregs,mmusr);
-                        force_sig(SIGSEGV, current);
+                        force_sig(SIGSEGV);
                         return;
                 }
 
@@ -621,7 +621,7 @@ static inline void bus_error030 (struct frame *fp)
         buserr:
                 pr_err("BAD KERNEL BUSERR\n");
                 die_if_kernel("Oops",&fp->ptregs,0);
-                force_sig(SIGKILL, current);
+                force_sig(SIGKILL);
                 return;
         }
 
@@ -660,7 +660,7 @@ static inline void bus_error030 (struct frame *fp)
                         addr, fp->ptregs.pc);
                 pr_debug("Unknown SIGSEGV - 2\n");
                 die_if_kernel("Oops",&fp->ptregs,mmusr);
-                force_sig(SIGSEGV, current);
+                force_sig(SIGSEGV);
                 return;
         }
 
@@ -804,7 +804,7 @@ asmlinkage void buserr_c(struct frame *fp)
         default:
           die_if_kernel("bad frame format",&fp->ptregs,0);
           pr_debug("Unknown SIGSEGV - 4\n");
-          force_sig(SIGSEGV, current);
+          force_sig(SIGSEGV);
         }
 }
 
@@ -1127,7 +1127,7 @@ asmlinkage void trap_c(struct frame *fp)
                 addr = (void __user*) fp->un.fmtb.daddr;
                 break;
         }
-        force_sig_fault(sig, si_code, addr, current);
+        force_sig_fault(sig, si_code, addr);
 }
 
 void die_if_kernel (char *str, struct pt_regs *fp, int nr)
@@ -1159,6 +1159,6 @@ asmlinkage void fpsp040_die(void)
 #ifdef CONFIG_M68KFPU_EMU
 asmlinkage void fpemu_signal(int signal, int code, void *addr)
 {
-        force_sig_fault(signal, code, addr, current);
+        force_sig_fault(signal, code, addr);
 }
 #endif
diff --git a/arch/m68k/mm/fault.c b/arch/m68k/mm/fault.c
index 9b6163c05a75..e9b1d7585b43 100644
--- a/arch/m68k/mm/fault.c
+++ b/arch/m68k/mm/fault.c
@@ -30,13 +30,13 @@ int send_fault_sig(struct pt_regs *regs)
         pr_debug("send_fault_sig: %p,%d,%d\n", addr, signo, si_code);
 
         if (user_mode(regs)) {
-                force_sig_fault(signo, si_code, addr, current);
+                force_sig_fault(signo, si_code, addr);
         } else {
                 if (fixup_exception(regs))
                         return -1;
 
                 //if (signo == SIGBUS)
-                //      force_sig_fault(si_signo, si_code, addr, current);
+                //      force_sig_fault(si_signo, si_code, addr);
 
                 /*
                  * Oops. The kernel tried to access some bad page. We'll have to