summaryrefslogtreecommitdiff
path: root/kernel/signal.c
diff options
context:
space:
mode:
Diffstat (limited to 'kernel/signal.c')
-rw-r--r--kernel/signal.c12
1 files changed, 10 insertions, 2 deletions
diff --git a/kernel/signal.c b/kernel/signal.c
index 5341e2141904..06214b55dc5e 100644
--- a/kernel/signal.c
+++ b/kernel/signal.c
@@ -2203,10 +2203,15 @@ relock:
* group-wide signal. Another thread should be notified now to take
* the signal since we will not.
*/
-static void retarget_shared_pending(struct task_struct *tsk)
+static void retarget_shared_pending(struct task_struct *tsk, sigset_t *which)
{
+ sigset_t retarget;
struct task_struct *t;
+ sigandsets(&retarget, &tsk->signal->shared_pending.signal, which);
+ if (sigisemptyset(&retarget))
+ return;
+
t = tsk;
while_each_thread(tsk, t) {
if (!signal_pending(t) && !(t->flags & PF_EXITING))
@@ -2217,6 +2222,7 @@ static void retarget_shared_pending(struct task_struct *tsk)
void exit_signals(struct task_struct *tsk)
{
int group_stop = 0;
+ sigset_t unblocked;
if (thread_group_empty(tsk) || signal_group_exit(tsk->signal)) {
tsk->flags |= PF_EXITING;
@@ -2232,7 +2238,9 @@ void exit_signals(struct task_struct *tsk)
if (!signal_pending(tsk))
goto out;
- retarget_shared_pending(tsk);
+ unblocked = tsk->blocked;
+ signotset(&unblocked);
+ retarget_shared_pending(tsk, &unblocked);
if (unlikely(tsk->group_stop & GROUP_STOP_PENDING) &&
task_participate_group_stop(tsk))