Commit 1be53963 authored by Oleg Nesterov's avatar Oleg Nesterov Committed by Linus Torvalds

signals: check ->group_stop_count after tracehook_get_signal()

Move the call to do_signal_stop() down, after tracehook call.  This makes
->group_stop_count condition visible to tracers before do_signal_stop()
will participate in this group-stop.

Currently the patch has no effect, tracehook_get_signal() always returns 0.
Signed-off-by: default avatarOleg Nesterov <oleg@redhat.com>
Acked-by: default avatarRoland McGrath <roland@redhat.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent ad09750b
...@@ -1840,11 +1840,6 @@ int get_signal_to_deliver(siginfo_t *info, struct k_sigaction *return_ka, ...@@ -1840,11 +1840,6 @@ int get_signal_to_deliver(siginfo_t *info, struct k_sigaction *return_ka,
for (;;) { for (;;) {
struct k_sigaction *ka; struct k_sigaction *ka;
if (unlikely(signal->group_stop_count > 0) &&
do_signal_stop(0))
goto relock;
/* /*
* Tracing can induce an artifical signal and choose sigaction. * Tracing can induce an artifical signal and choose sigaction.
* The return value in @signr determines the default action, * The return value in @signr determines the default action,
...@@ -1856,6 +1851,10 @@ int get_signal_to_deliver(siginfo_t *info, struct k_sigaction *return_ka, ...@@ -1856,6 +1851,10 @@ int get_signal_to_deliver(siginfo_t *info, struct k_sigaction *return_ka,
if (unlikely(signr != 0)) if (unlikely(signr != 0))
ka = return_ka; ka = return_ka;
else { else {
if (unlikely(signal->group_stop_count > 0) &&
do_signal_stop(0))
goto relock;
signr = dequeue_signal(current, &current->blocked, signr = dequeue_signal(current, &current->blocked,
info); info);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment