ptrace: change __ptrace_unlink() to clear ->ptrace under ->siglock
Oleg Nesterov
maintainerPATCH 1/1 ptrace: change __ptrace_unlink() to clear ->ptrace under ->siglock
This test-case (simplified version of generated by syzkaller)
#include <unistd.h>
#include <sys/ptrace.h>
#include <sys/wait.h>
void test(void)
{
for (;;) {
if (fork()) {
wait(NULL);
continue;
}
ptrace(PTRACE_SEIZE, getppid(), 0, 0);
ptrace(PTRACE_INTERRUPT, getppid(), 0, 0);
_exit(0);
}
}
int main(void)
{
int np;
for (np = 0; np < 8; ++np)
if (!fork())
test();
while (wait(NULL) > 0)
;
return 0;
}triggers the 2nd WARN_ON_ONCE(!signr) warning in do_jobctl_trap(). The problem is that __ptrace_unlink() clears task->jobctl under siglock but task->ptrace is cleared without this lock held; this fools the "else" branch which assumes that !PT_SEIZED means PT_PTRACED.
Note also that most of other PTRACE_SEIZE checks can race with detach from the exiting tracer too. Say, the callers of ptrace_trap_notify() assume that SEIZED can't go away after it was checked.
Reported-by Dmitry Vyukov <[email protected]>
Signed-off-by Oleg Nesterov <[email protected]>
--- kernel/ptrace.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
kernel/ptrace.c +1 -2
@@ -73,12 +73,11 @@ void __ptrace_unlink(struct task_struct *child) {BUG_ON (!child->ptrace); - child->ptrace =0 ; child->parent = child->real_parent;list_del_init (&child->ptrace_entry);spin_lock (&child->sighand->siglock); - + child->ptrace =0 ;/* * Clear all pending traps and TRAPPING. TRAPPING should be * cleared regardless of JOBCTL_STOP_PENDING. Do it explicitly.
Signature · 1 line
2.5.0