Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/signal

Pull third pile of signal handling patches from Al Viro:
 "This time it's mostly helpers and conversions to them; there's a lot
  of stuff remaining in the tree, but that'll either go in -rc2
  (isolated bug fixes, ideally via arch maintainers' trees) or will sit
  there until the next cycle."

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/signal:
  x86: get rid of calling do_notify_resume() when returning to kernel mode
  blackfin: check __get_user() return value
  whack-a-mole with TIF_FREEZE
  FRV: Optimise the system call exit path in entry.S [ver #2]
  FRV: Shrink TIF_WORK_MASK [ver #2]
  FRV: Prevent syscall exit tracing and notify_resume at end of kernel exceptions
  new helper: signal_delivered()
  powerpc: get rid of restore_sigmask()
  most of set_current_blocked() callers want SIGKILL/SIGSTOP removed from set
  set_restore_sigmask() is never called without SIGPENDING (and never should be)
  TIF_RESTORE_SIGMASK can be set only when TIF_SIGPENDING is set
  don't call try_to_freeze() from do_signal()
  pull clearing RESTORE_SIGMASK into block_sigmask()
  sh64: failure to build sigframe != signal without handler
  openrisc: tracehook_signal_handler() is supposed to be called on success
  new helper: sigmask_to_save()
  new helper: restore_saved_sigmask()
  new helpers: {clear,test,test_and_clear}_restore_sigmask()
  HAVE_RESTORE_SIGMASK is defined on all architectures now

1 files changed, 8 insertions, 32 deletions

diff --git a/arch/openrisc/kernel/signal.c b/arch/openrisc/kernel/signal.c
index 9ae611522953..30110297f4f9 100644
--- a/arch/openrisc/kernel/signal.c
+++ b/arch/openrisc/kernel/signal.c
@@ -33,8 +33,6 @@
 
 #define DEBUG_SIG 0
 
-#define _BLOCKABLE (~(sigmask(SIGKILL) | sigmask(SIGSTOP)))
-
 asmlinkage long
 _sys_sigaltstack(const stack_t *uss, stack_t *uoss, struct pt_regs *regs)
 {
@@ -101,7 +99,6 @@ asmlinkage long _sys_rt_sigreturn(struct pt_regs *regs)
         if (__copy_from_user(&set, &frame->uc.uc_sigmask, sizeof(set)))
                 goto badframe;
 
-        sigdelsetmask(&set, ~_BLOCKABLE);
         set_current_blocked(&set);
 
         if (restore_sigcontext(regs, &frame->uc.uc_mcontext))
@@ -251,20 +248,19 @@ give_sigsegv:
         return -EFAULT;
 }
 
-static inline int
+static inline void
 handle_signal(unsigned long sig,
               siginfo_t *info, struct k_sigaction *ka,
-              sigset_t *oldset, struct pt_regs *regs)
+              struct pt_regs *regs)
 {
         int ret;
 
-        ret = setup_rt_frame(sig, ka, info, oldset, regs);
+        ret = setup_rt_frame(sig, ka, info, sigmask_to_save(), regs);
         if (ret)
-                return ret;
-
-        block_sigmask(ka, sig);
+                return;
 
-        return 0;
+        signal_delivered(sig, info, ka, regs,
+                                 test_thread_flag(TIF_SINGLESTEP));
 }
 
 /*
@@ -339,30 +335,10 @@ void do_signal(struct pt_regs *regs)
         if (signr <= 0) {
                 /* no signal to deliver so we just put the saved sigmask
                  * back */
-                if (test_thread_flag(TIF_RESTORE_SIGMASK)) {
-                        clear_thread_flag(TIF_RESTORE_SIGMASK);
-                        sigprocmask(SIG_SETMASK, &current->saved_sigmask, NULL);
-                }
-
+                restore_saved_sigmask();
         } else {                /* signr > 0 */
-                sigset_t *oldset;
-
-                if (current_thread_info()->flags & _TIF_RESTORE_SIGMASK)
-                        oldset = &current->saved_sigmask;
-                else
-                        oldset = &current->blocked;
-
                 /* Whee!  Actually deliver the signal.  */
-                if (!handle_signal(signr, &info, &ka, oldset, regs)) {
-                        /* a signal was successfully delivered; the saved
-                         * sigmask will have been stored in the signal frame,
-                         * and will be restored by sigreturn, so we can simply
-                         * clear the TIF_RESTORE_SIGMASK flag */
-                        clear_thread_flag(TIF_RESTORE_SIGMASK);
-                }
-
-                tracehook_signal_handler(signr, &info, &ka, regs,
-                                         test_thread_flag(TIF_SINGLESTEP));
+                handle_signal(signr, &info, &ka, regs);
         }
 
         return;