Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ce24d8a1 authored by Matt Fleming's avatar Matt Fleming Committed by Linus Torvalds
Browse files

sparc: use block_sigmask() 



Use the new helper function introduced in commit 5e6292c0 ("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: default avatarOleg Nesterov <oleg@redhat.com>
Acked-by: default avatar"David S. Miller" <davem@davemloft.net>
Signed-off-by: default avatarMatt Fleming <matt.fleming@intel.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent d12f7c4a

arch/sparc/kernel/signal32.c

+1 −6
Original line number Diff line number Diff line
@@ -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;

arch/sparc/kernel/signal_32.c

+1 −6
Original line number Diff line number Diff line
@@ -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;

arch/sparc/kernel/signal_64.c

+1 −5
Original line number Diff line number Diff line
@@ -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;