[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <20110426195002.GF8520@redhat.com>
Date: Tue, 26 Apr 2011 21:50:02 +0200
From: Oleg Nesterov <oleg@...hat.com>
To: Linus Torvalds <torvalds@...ux-foundation.org>,
Andrew Morton <akpm@...ux-foundation.org>
Cc: Tejun Heo <tj@...nel.org>,
"Nikita V. Youshchenko" <nyoushchenko@...sta.com>,
Matt Fleming <matt@...sole-pimps.org>,
linux-kernel@...r.kernel.org
Subject: [PATCH v2 5/6] signal: sys_sigprocmask() needs
retarget_shared_pending()
sys_sigprocmask() changes current->blocked by hand. Convert this code to
use sigprocmask() which implies the necessary retarget_shared_pending().
Signed-off-by: Oleg Nesterov <oleg@...hat.com>
---
kernel/signal.c | 24 ++++++------------------
1 file changed, 6 insertions(+), 18 deletions(-)
--- sigprocmask/kernel/signal.c~5_old_sigprocmask_retarget 2011-04-26 19:54:09.000000000 +0200
+++ sigprocmask/kernel/signal.c 2011-04-26 19:54:20.000000000 +0200
@@ -2702,6 +2702,7 @@ SYSCALL_DEFINE3(sigprocmask, int, how, o
old_sigset_t __user *, oset)
{
old_sigset_t old_set, new_set;
+ sigset_t new_full_set;
int error;
old_set = current->blocked.sig[0];
@@ -2711,25 +2712,12 @@ SYSCALL_DEFINE3(sigprocmask, int, how, o
return -EFAULT;
new_set &= ~(sigmask(SIGKILL) | sigmask(SIGSTOP));
- error = 0;
- spin_lock_irq(¤t->sighand->siglock);
- switch (how) {
- default:
- error = -EINVAL;
- break;
- case SIG_BLOCK:
- sigaddsetmask(¤t->blocked, new_set);
- break;
- case SIG_UNBLOCK:
- sigdelsetmask(¤t->blocked, new_set);
- break;
- case SIG_SETMASK:
- current->blocked.sig[0] = new_set;
- break;
- }
+ sigemptyset(&new_full_set);
+ if (how == SIG_SETMASK)
+ new_full_set = current->blocked;
+ new_full_set.sig[0] = new_set;
- recalc_sigpending();
- spin_unlock_irq(¤t->sighand->siglock);
+ error = sigprocmask(how, &new_full_set, NULL);
if (error)
return error;
}
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists