]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
signal: sys_sigprocmask() needs retarget_shared_pending()
authorOleg Nesterov <oleg@redhat.com>
Mon, 9 May 2011 11:48:56 +0000 (13:48 +0200)
committerOleg Nesterov <oleg@redhat.com>
Mon, 9 May 2011 11:48:56 +0000 (13:48 +0200)
sys_sigprocmask() changes current->blocked by hand. Convert this code
to use set_current_blocked().

Signed-off-by: Oleg Nesterov <oleg@redhat.com>
kernel/signal.c

index c0af959b8530afb413f68484ded16cfbfe74129c..b87780ef7d28531bfd813ef1042f966b4a63a5f0 100644 (file)
@@ -2900,7 +2900,7 @@ SYSCALL_DEFINE3(sigprocmask, int, how, old_sigset_t __user *, nset,
                old_sigset_t __user *, oset)
 {
        old_sigset_t old_set, new_set;
-       int error;
+       sigset_t new_blocked;
 
        old_set = current->blocked.sig[0];
 
@@ -2909,27 +2909,23 @@ SYSCALL_DEFINE3(sigprocmask, int, how, old_sigset_t __user *, nset,
                        return -EFAULT;
                new_set &= ~(sigmask(SIGKILL) | sigmask(SIGSTOP));
 
-               error = 0;
-               spin_lock_irq(&current->sighand->siglock);
+               new_blocked = current->blocked;
+
                switch (how) {
-               default:
-                       error = -EINVAL;
-                       break;
                case SIG_BLOCK:
-                       sigaddsetmask(&current->blocked, new_set);
+                       sigaddsetmask(&new_blocked, new_set);
                        break;
                case SIG_UNBLOCK:
-                       sigdelsetmask(&current->blocked, new_set);
+                       sigdelsetmask(&new_blocked, new_set);
                        break;
                case SIG_SETMASK:
-                       current->blocked.sig[0] = new_set;
+                       new_blocked.sig[0] = new_set;
                        break;
+               default:
+                       return -EINVAL;
                }
 
-               recalc_sigpending();
-               spin_unlock_irq(&current->sighand->siglock);
-               if (error)
-                       return error;
+               set_current_blocked(&new_blocked);
        }
 
        if (oset) {