|
@@ -127,15 +127,17 @@ int copy_siginfo_from_user32(siginfo_t *to, compat_siginfo_t __user *from)
|
|
|
|
|
|
asmlinkage long sys32_sigsuspend(int history0, int history1, old_sigset_t mask)
|
|
|
{
|
|
|
- mask &= _BLOCKABLE;
|
|
|
- spin_lock_irq(¤t->sighand->siglock);
|
|
|
+ sigset_t blocked;
|
|
|
+
|
|
|
current->saved_sigmask = current->blocked;
|
|
|
- siginitset(¤t->blocked, mask);
|
|
|
- recalc_sigpending();
|
|
|
- spin_unlock_irq(¤t->sighand->siglock);
|
|
|
+
|
|
|
+ mask &= _BLOCKABLE;
|
|
|
+ siginitset(&blocked, mask);
|
|
|
+ set_current_blocked(&blocked);
|
|
|
|
|
|
current->state = TASK_INTERRUPTIBLE;
|
|
|
schedule();
|
|
|
+
|
|
|
set_restore_sigmask();
|
|
|
return -ERESTARTNOHAND;
|
|
|
}
|
|
@@ -279,10 +281,7 @@ asmlinkage long sys32_sigreturn(struct pt_regs *regs)
|
|
|
goto badframe;
|
|
|
|
|
|
sigdelsetmask(&set, ~_BLOCKABLE);
|
|
|
- spin_lock_irq(¤t->sighand->siglock);
|
|
|
- current->blocked = set;
|
|
|
- recalc_sigpending();
|
|
|
- spin_unlock_irq(¤t->sighand->siglock);
|
|
|
+ set_current_blocked(&set);
|
|
|
|
|
|
if (ia32_restore_sigcontext(regs, &frame->sc, &ax))
|
|
|
goto badframe;
|
|
@@ -308,10 +307,7 @@ asmlinkage long sys32_rt_sigreturn(struct pt_regs *regs)
|
|
|
goto badframe;
|
|
|
|
|
|
sigdelsetmask(&set, ~_BLOCKABLE);
|
|
|
- spin_lock_irq(¤t->sighand->siglock);
|
|
|
- current->blocked = set;
|
|
|
- recalc_sigpending();
|
|
|
- spin_unlock_irq(¤t->sighand->siglock);
|
|
|
+ set_current_blocked(&set);
|
|
|
|
|
|
if (ia32_restore_sigcontext(regs, &frame->uc.uc_mcontext, &ax))
|
|
|
goto badframe;
|