aboutsummaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorOleg Nesterov <oleg@tv-sign.ru>2008-05-26 12:55:42 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2008-05-26 13:37:06 -0400
commitc8e85b4f4b9ee23bf0e79bdeb3da274a0f9c663f (patch)
tree5eadfdc177f24261379f36798c3366df9be4a00a /kernel
parent84a881657d391121cd88c37f0a312dec3528fa44 (diff)
posix timers: sigqueue_free: don't free sigqueue if it is queued
Currently sigqueue_free() removes sigqueue from list, but doesn't cancel the pending signal. This is not consistent, the task should either receive the "full" signal along with siginfo_t, or it shouldn't receive the signal at all. Change sigqueue_free() to clear SIGQUEUE_PREALLOC but leave sigqueue on list if it is queued. This is a user-visible change. If the signal is blocked, it stays queued after sys_timer_delete() until unblocked with the "stale" si_code/si_value, and of course it is still counted wrt RLIMIT_SIGPENDING which also limits the number of posix timers. Signed-off-by: Oleg Nesterov <oleg@tv-sign.ru> Cc: Austin Clements <amdragon+kernelbugzilla@mit.edu> Cc: Roland McGrath <roland@redhat.com> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'kernel')
-rw-r--r--kernel/signal.c16
1 files changed, 10 insertions, 6 deletions
diff --git a/kernel/signal.c b/kernel/signal.c
index 12ffea7c201d..2955f6c4f36e 100644
--- a/kernel/signal.c
+++ b/kernel/signal.c
@@ -1240,18 +1240,22 @@ void sigqueue_free(struct sigqueue *q)
1240 1240
1241 BUG_ON(!(q->flags & SIGQUEUE_PREALLOC)); 1241 BUG_ON(!(q->flags & SIGQUEUE_PREALLOC));
1242 /* 1242 /*
1243 * If the signal is still pending remove it from the 1243 * We must hold ->siglock while testing q->list
1244 * pending queue. We must hold ->siglock while testing 1244 * to serialize with collect_signal() or with
1245 * q->list to serialize with collect_signal() or with
1246 * __exit_signal()->flush_sigqueue(). 1245 * __exit_signal()->flush_sigqueue().
1247 */ 1246 */
1248 spin_lock_irqsave(lock, flags); 1247 spin_lock_irqsave(lock, flags);
1248 q->flags &= ~SIGQUEUE_PREALLOC;
1249 /*
1250 * If it is queued it will be freed when dequeued,
1251 * like the "regular" sigqueue.
1252 */
1249 if (!list_empty(&q->list)) 1253 if (!list_empty(&q->list))
1250 list_del_init(&q->list); 1254 q = NULL;
1251 spin_unlock_irqrestore(lock, flags); 1255 spin_unlock_irqrestore(lock, flags);
1252 1256
1253 q->flags &= ~SIGQUEUE_PREALLOC; 1257 if (q)
1254 __sigqueue_free(q); 1258 __sigqueue_free(q);
1255} 1259}
1256 1260
1257int send_sigqueue(struct sigqueue *q, struct task_struct *t, int group) 1261int send_sigqueue(struct sigqueue *q, struct task_struct *t, int group)