diff options
| author | Oleg Nesterov | 2008-04-30 09:52:48 +0200 |
|---|---|---|
| committer | Linus Torvalds | 2008-04-30 17:29:35 +0200 |
| commit | 5fc894bb4fb1de8373d1d5fb6db19204a16859e8 (patch) | |
| tree | 167c513b50b8ceed48a8fb7e4c2e63397f0fa7d7 /kernel/signal.c | |
| parent | signals: send_sigqueue: don't take rcu lock (diff) | |
| download | kernel-qcow2-linux-5fc894bb4fb1de8373d1d5fb6db19204a16859e8.tar.gz kernel-qcow2-linux-5fc894bb4fb1de8373d1d5fb6db19204a16859e8.tar.xz kernel-qcow2-linux-5fc894bb4fb1de8373d1d5fb6db19204a16859e8.zip | |
signals: send_sigqueue: don't forget about handle_stop_signal()
send_group_sigqueue() calls handle_stop_signal(), send_sigqueue() doesn't.
This is not consistent and in fact I'd say this is (minor) bug.
Move handle_stop_signal() from send_group_sigqueue() to do_send_sigqueue(),
the latter is called by send_sigqueue() too.
Signed-off-by: Oleg Nesterov <oleg@tv-sign.ru>
Cc: Roland McGrath <roland@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'kernel/signal.c')
| -rw-r--r-- | kernel/signal.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/kernel/signal.c b/kernel/signal.c index 0a8b0aece80d..8259262eaa60 100644 --- a/kernel/signal.c +++ b/kernel/signal.c @@ -1274,8 +1274,10 @@ void sigqueue_free(struct sigqueue *q) } static int do_send_sigqueue(int sig, struct sigqueue *q, struct task_struct *t, - struct sigpending *pending) + struct sigpending *pending) { + handle_stop_signal(sig, t); + if (unlikely(!list_empty(&q->list))) { /* * If an SI_TIMER entry is already queue just increment @@ -1335,7 +1337,6 @@ send_group_sigqueue(int sig, struct sigqueue *q, struct task_struct *p) read_lock(&tasklist_lock); /* Since it_lock is held, p->sighand cannot be NULL. */ spin_lock_irqsave(&p->sighand->siglock, flags); - handle_stop_signal(sig, p); ret = do_send_sigqueue(sig, q, p, &p->signal->shared_pending); |