signal: make sure we don't get stopped with pending task_work
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
This commit is contained in:
parent
1e0ea00144
commit
7266702805
|
@ -1971,6 +1971,13 @@ static void ptrace_do_notify(int signr, int exit_code, int why)
|
|||
void ptrace_notify(int exit_code)
|
||||
{
|
||||
BUG_ON((exit_code & (0x7f | ~0xffff)) != SIGTRAP);
|
||||
if (unlikely(current->task_works)) {
|
||||
if (test_and_clear_ti_thread_flag(current_thread_info(),
|
||||
TIF_NOTIFY_RESUME)) {
|
||||
smp_mb__after_clear_bit();
|
||||
task_work_run();
|
||||
}
|
||||
}
|
||||
|
||||
spin_lock_irq(¤t->sighand->siglock);
|
||||
ptrace_do_notify(SIGTRAP, exit_code, CLD_TRAPPED);
|
||||
|
@ -2191,6 +2198,14 @@ int get_signal_to_deliver(siginfo_t *info, struct k_sigaction *return_ka,
|
|||
struct signal_struct *signal = current->signal;
|
||||
int signr;
|
||||
|
||||
if (unlikely(current->task_works)) {
|
||||
if (test_and_clear_ti_thread_flag(current_thread_info(),
|
||||
TIF_NOTIFY_RESUME)) {
|
||||
smp_mb__after_clear_bit();
|
||||
task_work_run();
|
||||
}
|
||||
}
|
||||
|
||||
if (unlikely(uprobe_deny_signal()))
|
||||
return 0;
|
||||
|
||||
|
|
Loading…
Reference in New Issue