diff options
author | Oleg Nesterov <oleg@tv-sign.ru> | 2008-04-30 03:52:48 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-30 11:29:35 -0400 |
commit | 5fc894bb4fb1de8373d1d5fb6db19204a16859e8 (patch) | |
tree | 167c513b50b8ceed48a8fb7e4c2e63397f0fa7d7 /kernel | |
parent | 5c193e8871b76f3bf8ed1e31f7af7c70890ebc4f (diff) |
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')
-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) | |||
1274 | } | 1274 | } |
1275 | 1275 | ||
1276 | static int do_send_sigqueue(int sig, struct sigqueue *q, struct task_struct *t, | 1276 | static int do_send_sigqueue(int sig, struct sigqueue *q, struct task_struct *t, |
1277 | struct sigpending *pending) | 1277 | struct sigpending *pending) |
1278 | { | 1278 | { |
1279 | handle_stop_signal(sig, t); | ||
1280 | |||
1279 | if (unlikely(!list_empty(&q->list))) { | 1281 | if (unlikely(!list_empty(&q->list))) { |
1280 | /* | 1282 | /* |
1281 | * If an SI_TIMER entry is already queue just increment | 1283 | * 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) | |||
1335 | read_lock(&tasklist_lock); | 1337 | read_lock(&tasklist_lock); |
1336 | /* Since it_lock is held, p->sighand cannot be NULL. */ | 1338 | /* Since it_lock is held, p->sighand cannot be NULL. */ |
1337 | spin_lock_irqsave(&p->sighand->siglock, flags); | 1339 | spin_lock_irqsave(&p->sighand->siglock, flags); |
1338 | handle_stop_signal(sig, p); | ||
1339 | 1340 | ||
1340 | ret = do_send_sigqueue(sig, q, p, &p->signal->shared_pending); | 1341 | ret = do_send_sigqueue(sig, q, p, &p->signal->shared_pending); |
1341 | 1342 | ||