signal: add block_sigmask() for adding sigmask to current->blocked
Abstract the code sequence for adding a signal handler's sa_mask to current->blocked because the sequence is identical for all architectures. Furthermore, in the past some architectures actually got this code wrong, so introduce a wrapper that all architectures can use. Signed-off-by: Matt Fleming <matt.fleming@intel.com> Signed-off-by: Oleg Nesterov <oleg@redhat.com> Cc: Thomas Gleixner <tglx@linutronix.de> Cc: Ingo Molnar <mingo@elte.hu> Cc: H. Peter Anvin <hpa@zytor.com> Cc: Tejun Heo <tj@kernel.org> Cc: "David S. Miller" <davem@davemloft.net> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:

committed by
Linus Torvalds

parent
f350b1778f
commit
5e6292c0f2
@@ -2318,6 +2318,27 @@ relock:
|
||||
return signr;
|
||||
}
|
||||
|
||||
/**
|
||||
* block_sigmask - add @ka's signal mask to current->blocked
|
||||
* @ka: action for @signr
|
||||
* @signr: signal that has been successfully delivered
|
||||
*
|
||||
* This function should be called when a signal has succesfully been
|
||||
* delivered. It adds the mask of signals for @ka to current->blocked
|
||||
* so that they are blocked during the execution of the signal
|
||||
* handler. In addition, @signr will be blocked unless %SA_NODEFER is
|
||||
* set in @ka->sa.sa_flags.
|
||||
*/
|
||||
void block_sigmask(struct k_sigaction *ka, int signr)
|
||||
{
|
||||
sigset_t blocked;
|
||||
|
||||
sigorsets(&blocked, ¤t->blocked, &ka->sa.sa_mask);
|
||||
if (!(ka->sa.sa_flags & SA_NODEFER))
|
||||
sigaddset(&blocked, signr);
|
||||
set_current_blocked(&blocked);
|
||||
}
|
||||
|
||||
/*
|
||||
* It could be that complete_signal() picked us to notify about the
|
||||
* group-wide signal. Other threads should be notified now to take
|
||||
|
Reference in New Issue
Block a user