sparc: use block_sigmask()

Use the new helper function introduced in commit 5e6292c0f28f ("signal:
add block_sigmask() for adding sigmask to current->blocked") which
centralises the code for updating current->blocked after successfully
delivering a signal and reduces the amount of duplicate code across
architectures.  In the past some architectures got this code wrong, so
using this helper function should stop that from happening again.

Acked-by: Oleg Nesterov <oleg@redhat.com>
Acked-by: "David S. Miller" <davem@davemloft.net>
Signed-off-by: Matt Fleming <matt.fleming@intel.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

3 files changed, 3 insertions, 17 deletions

diff --git a/arch/sparc/kernel/signal32.c b/arch/sparc/kernel/signal32.c
index 023b8860dc97..c8f5b50db89c 100644
--- a/arch/sparc/kernel/signal32.c
+++ b/arch/sparc/kernel/signal32.c
@@ -776,7 +776,6 @@ static inline int handle_signal32(unsigned long signr, struct k_sigaction *ka,
                                   siginfo_t *info,
                                   sigset_t *oldset, struct pt_regs *regs)
 {
-        sigset_t blocked;
         int err;
 
         if (ka->sa.sa_flags & SA_SIGINFO)
@@ -787,11 +786,7 @@ static inline int handle_signal32(unsigned long signr, struct k_sigaction *ka,
         if (err)
                 return err;
 
-        sigorsets(&blocked, &current->blocked, &ka->sa.sa_mask);
-        if (!(ka->sa.sa_flags & SA_NOMASK))
-                sigaddset(&blocked, signr);
-        set_current_blocked(&blocked);
-
+        block_sigmask(ka, signr);
         tracehook_signal_handler(signr, info, ka, regs, 0);
 
         return 0;
diff --git a/arch/sparc/kernel/signal_32.c b/arch/sparc/kernel/signal_32.c
index d54c6e53aba0..7bb71b6fbd20 100644
--- a/arch/sparc/kernel/signal_32.c
+++ b/arch/sparc/kernel/signal_32.c
@@ -465,7 +465,6 @@ static inline int
 handle_signal(unsigned long signr, struct k_sigaction *ka,
               siginfo_t *info, sigset_t *oldset, struct pt_regs *regs)
 {
-        sigset_t blocked;
         int err;
 
         if (ka->sa.sa_flags & SA_SIGINFO)
@@ -476,11 +475,7 @@ handle_signal(unsigned long signr, struct k_sigaction *ka,
         if (err)
                 return err;
 
-        sigorsets(&blocked, &current->blocked, &ka->sa.sa_mask);
-        if (!(ka->sa.sa_flags & SA_NOMASK))
-                sigaddset(&blocked, signr);
-        set_current_blocked(&blocked);
-
+        block_sigmask(ka, signr);
         tracehook_signal_handler(signr, info, ka, regs, 0);
 
         return 0;
diff --git a/arch/sparc/kernel/signal_64.c b/arch/sparc/kernel/signal_64.c
index f0836cd0e2f2..d8a67e60be80 100644
--- a/arch/sparc/kernel/signal_64.c
+++ b/arch/sparc/kernel/signal_64.c
@@ -479,18 +479,14 @@ static inline int handle_signal(unsigned long signr, struct k_sigaction *ka,
                                 siginfo_t *info,
                                 sigset_t *oldset, struct pt_regs *regs)
 {
-        sigset_t blocked;
         int err;
 
         err = setup_rt_frame(ka, regs, signr, oldset,
                              (ka->sa.sa_flags & SA_SIGINFO) ? info : NULL);
         if (err)
                 return err;
-        sigorsets(&blocked, &current->blocked, &ka->sa.sa_mask);
-        if (!(ka->sa.sa_flags & SA_NOMASK))
-                sigaddset(&blocked, signr);
-        set_current_blocked(&blocked);
 
+        block_sigmask(ka, signr);
         tracehook_signal_handler(signr, info, ka, regs, 0);
 
         return 0;