diff options
Diffstat (limited to 'kernel/signal.c')
-rw-r--r-- | kernel/signal.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/kernel/signal.c b/kernel/signal.c index 10b31ecdd9c8..e9e699f4b1bd 100644 --- a/kernel/signal.c +++ b/kernel/signal.c | |||
@@ -596,9 +596,6 @@ static int check_kill_permission(int sig, struct siginfo *info, | |||
596 | return security_task_kill(t, info, sig, 0); | 596 | return security_task_kill(t, info, sig, 0); |
597 | } | 597 | } |
598 | 598 | ||
599 | /* forward decl */ | ||
600 | static void do_notify_parent_cldstop(struct task_struct *tsk, int why); | ||
601 | |||
602 | /* | 599 | /* |
603 | * Handle magic process-wide effects of stop/continue signals. Unlike | 600 | * Handle magic process-wide effects of stop/continue signals. Unlike |
604 | * the signal actions, these happen immediately at signal-generation | 601 | * the signal actions, these happen immediately at signal-generation |
@@ -1605,7 +1602,7 @@ finish_stop(int stop_count) | |||
1605 | * a group stop in progress and we are the last to stop, | 1602 | * a group stop in progress and we are the last to stop, |
1606 | * report to the parent. When ptraced, every thread reports itself. | 1603 | * report to the parent. When ptraced, every thread reports itself. |
1607 | */ | 1604 | */ |
1608 | if (stop_count == 0 || (current->ptrace & PT_PTRACED)) { | 1605 | if (tracehook_notify_jctl(stop_count == 0, CLD_STOPPED)) { |
1609 | read_lock(&tasklist_lock); | 1606 | read_lock(&tasklist_lock); |
1610 | do_notify_parent_cldstop(current, CLD_STOPPED); | 1607 | do_notify_parent_cldstop(current, CLD_STOPPED); |
1611 | read_unlock(&tasklist_lock); | 1608 | read_unlock(&tasklist_lock); |
@@ -1741,6 +1738,9 @@ relock: | |||
1741 | signal->flags &= ~SIGNAL_CLD_MASK; | 1738 | signal->flags &= ~SIGNAL_CLD_MASK; |
1742 | spin_unlock_irq(&sighand->siglock); | 1739 | spin_unlock_irq(&sighand->siglock); |
1743 | 1740 | ||
1741 | if (unlikely(!tracehook_notify_jctl(1, why))) | ||
1742 | goto relock; | ||
1743 | |||
1744 | read_lock(&tasklist_lock); | 1744 | read_lock(&tasklist_lock); |
1745 | do_notify_parent_cldstop(current->group_leader, why); | 1745 | do_notify_parent_cldstop(current->group_leader, why); |
1746 | read_unlock(&tasklist_lock); | 1746 | read_unlock(&tasklist_lock); |
@@ -1906,7 +1906,7 @@ void exit_signals(struct task_struct *tsk) | |||
1906 | out: | 1906 | out: |
1907 | spin_unlock_irq(&tsk->sighand->siglock); | 1907 | spin_unlock_irq(&tsk->sighand->siglock); |
1908 | 1908 | ||
1909 | if (unlikely(group_stop)) { | 1909 | if (unlikely(group_stop) && tracehook_notify_jctl(1, CLD_STOPPED)) { |
1910 | read_lock(&tasklist_lock); | 1910 | read_lock(&tasklist_lock); |
1911 | do_notify_parent_cldstop(tsk, CLD_STOPPED); | 1911 | do_notify_parent_cldstop(tsk, CLD_STOPPED); |
1912 | read_unlock(&tasklist_lock); | 1912 | read_unlock(&tasklist_lock); |