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

Commit a2007ce8 authored by Matt Fleming's avatar Matt Fleming Committed by Benjamin Herrenschmidt
Browse files

powerpc: Use set_current_blocked() and block_sigmask() 



As described in e6fa16ab ("signal: sigprocmask() should do
retarget_shared_pending()") the modification of current->blocked is
incorrect as we need to check whether the signal we're about to block
is pending in the shared queue.

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

Cc: Oleg Nesterov <oleg@redhat.com>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Paul Mackerras <paulus@samba.org>
Cc: linuxppc-dev@lists.ozlabs.org
Signed-off-by: default avatarMatt Fleming <matt.fleming@intel.com>
Signed-off-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
parent a2234b4b

arch/powerpc/kernel/signal.c

+2 −11
Original line number Original line Diff line number Diff line
@@ -57,10 +57,7 @@ void __user * get_sigframe(struct k_sigaction *ka, struct pt_regs *regs, 
void restore_sigmask(sigset_t *set)

void restore_sigmask(sigset_t *set)

{

{

	sigdelsetmask(set, ~_BLOCKABLE);

	sigdelsetmask(set, ~_BLOCKABLE);

	spin_lock_irq(&current->sighand->siglock);

	set_current_blocked(set);

	current->blocked = *set;

	recalc_sigpending();

	spin_unlock_irq(&current->sighand->siglock);

}

}





static void check_syscall_restart(struct pt_regs *regs, struct k_sigaction *ka,

static void check_syscall_restart(struct pt_regs *regs, struct k_sigaction *ka,
@@ -169,13 +166,7 @@ static int do_signal(struct pt_regs *regs) 




	regs->trap = 0;

	regs->trap = 0;

	if (ret) {

	if (ret) {

		spin_lock_irq(&current->sighand->siglock);

		block_sigmask(&ka, signr);

		sigorsets(&current->blocked, &current->blocked,

			  &ka.sa.sa_mask);

		if (!(ka.sa.sa_flags & SA_NODEFER))

			sigaddset(&current->blocked, signr);

		recalc_sigpending();

		spin_unlock_irq(&current->sighand->siglock);





		/*

		/*

		 * A signal was successfully delivered; the saved sigmask is in

		 * A signal was successfully delivered; the saved sigmask is in

arch/powerpc/kernel/signal_32.c

+6 −5
Original line number Original line Diff line number Diff line
@@ -242,12 +242,13 @@ static inline int restore_general_regs(struct pt_regs *regs, 
 */

 */

long sys_sigsuspend(old_sigset_t mask)

long sys_sigsuspend(old_sigset_t mask)

{

{

	mask &= _BLOCKABLE;

	sigset_t blocked;

	spin_lock_irq(&current->sighand->siglock);



	current->saved_sigmask = current->blocked;

	current->saved_sigmask = current->blocked;

	siginitset(&current->blocked, mask);



	recalc_sigpending();

	mask &= _BLOCKABLE;

	spin_unlock_irq(&current->sighand->siglock);

	siginitset(&blocked, mask);

	set_current_blocked(&blocked);





 	current->state = TASK_INTERRUPTIBLE;

 	current->state = TASK_INTERRUPTIBLE;

 	schedule();

 	schedule();