aboutsummaryrefslogtreecommitdiffstats
path: root/arch/um/kernel
diff options
context:
space:
mode:
authorMatt Fleming <matt.fleming@intel.com>2012-03-23 18:01:50 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2012-03-23 19:58:31 -0400
commitd982d5955e9033015a2cc119aa7c0a878e275964 (patch)
tree19ce3a7db9d68886c73124831eb9937ad7a019b7 /arch/um/kernel
parentf6adb9a6aec0ec9540e15f354e5cdec88b2aea33 (diff)
um: use set_current_blocked() and block_sigmask()
As described in commit e6fa16ab9c1e ("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 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> Cc: Richard Weinberger <richard@nod.at> 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>
Diffstat (limited to 'arch/um/kernel')
-rw-r--r--arch/um/kernel/signal.c20
1 files changed, 6 insertions, 14 deletions
diff --git a/arch/um/kernel/signal.c b/arch/um/kernel/signal.c
index 8382e0b91e8b..fb12f4c5e649 100644
--- a/arch/um/kernel/signal.c
+++ b/arch/um/kernel/signal.c
@@ -67,15 +67,8 @@ static int handle_signal(struct pt_regs *regs, unsigned long signr,
67 67
68 if (err) 68 if (err)
69 force_sigsegv(signr, current); 69 force_sigsegv(signr, current);
70 else { 70 else
71 spin_lock_irq(&current->sighand->siglock); 71 block_sigmask(ka, signr);
72 sigorsets(&current->blocked, &current->blocked,
73 &ka->sa.sa_mask);
74 if (!(ka->sa.sa_flags & SA_NODEFER))
75 sigaddset(&current->blocked, signr);
76 recalc_sigpending();
77 spin_unlock_irq(&current->sighand->siglock);
78 }
79 72
80 return err; 73 return err;
81} 74}
@@ -158,12 +151,11 @@ int do_signal(void)
158 */ 151 */
159long sys_sigsuspend(int history0, int history1, old_sigset_t mask) 152long sys_sigsuspend(int history0, int history1, old_sigset_t mask)
160{ 153{
154 sigset_t blocked;
155
161 mask &= _BLOCKABLE; 156 mask &= _BLOCKABLE;
162 spin_lock_irq(&current->sighand->siglock); 157 siginitset(&blocked, mask);
163 current->saved_sigmask = current->blocked; 158 set_current_blocked(&blocked);
164 siginitset(&current->blocked, mask);
165 recalc_sigpending();
166 spin_unlock_irq(&current->sighand->siglock);
167 159
168 current->state = TASK_INTERRUPTIBLE; 160 current->state = TASK_INTERRUPTIBLE;
169 schedule(); 161 schedule();