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

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

um: use set_current_blocked() and block_sigmask() 



As described in commit 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.

Acked-by: default avatarOleg Nesterov <oleg@redhat.com>
Cc: Richard Weinberger <richard@nod.at>
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 f6adb9a6

arch/um/kernel/signal.c

+6 −14
Original line number Diff line number Diff line
@@ -67,15 +67,8 @@ static int handle_signal(struct pt_regs *regs, unsigned long signr, 


	if (err)

		force_sigsegv(signr, current);

	else {

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

		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);

	}

	else

		block_sigmask(ka, signr);



	return err;

}
@@ -158,12 +151,11 @@ int do_signal(void) 
 */

long sys_sigsuspend(int history0, int history1, old_sigset_t mask)

{

	sigset_t blocked;



	mask &= _BLOCKABLE;

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

	current->saved_sigmask = current->blocked;

	siginitset(&current->blocked, mask);

	recalc_sigpending();

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

	siginitset(&blocked, mask);

	set_current_blocked(&blocked);



	current->state = TASK_INTERRUPTIBLE;

	schedule();