ptrace: fix clearing of JOBCTL_TRACED in ptrace_unfreeze_traced()
PATCH 1/1 ptrace: fix clearing of JOBCTL_TRACED in ptrace_unfreeze_traced()
CI reported the following splat while running the strace testsuite:
[ 3976.640309] WARNING: CPU: 1 PID: 3570031 at kernel/ptrace.c:272 ptrace_check_attach+0x12e/0x178 [ 3976.640391] CPU: 1 PID: 3570031 Comm: strace Tainted: G OE 5.19.0-20220624.rc3.git0.ee819a77d4e7.300.fc36.s390x #1 [ 3976.640410] Hardware name: IBM 3906 M04 704 (z/VM 7.1.0) [ 3976.640452] Call Trace: [ 3976.640454] [<00000000ab4b645a>] ptrace_check_attach+0x132/0x178 [ 3976.640457] ([<00000000ab4b6450>] ptrace_check_attach+0x128/0x178) [ 3976.640460] [<00000000ab4b6cde>] __s390x_sys_ptrace+0x86/0x160 [ 3976.640463] [<00000000ac03fcec>] __do_syscall+0x1d4/0x200 [ 3976.640468] [<00000000ac04e312>] system_call+0x82/0xb0 [ 3976.640470] Last Breaking-Event-Address: [ 3976.640471] [<00000000ab4ea3c8>] wait_task_inactive+0x98/0x190
This is because JOBCTL_TRACED is set, but the task is not in TASK_TRACED state. Caused by ptrace_unfreeze_traced() which does:
task->jobctl &= ~TASK_TRACED
but it should be:
task->jobctl &= ~JOBCTL_TRACED
--- kernel/ptrace.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
kernel/ptrace.c +1 -1
@@ -222,7 +222,7 @@ static void ptrace_unfreeze_traced(struct task_struct *task)if (lock_task_sighand (task, &flags)) { task->jobctl &= ~JOBCTL_PTRACE_FROZEN ;if (__fatal_signal_pending (task)) { - task->jobctl &= ~TASK_TRACED ; + task->jobctl &= ~JOBCTL_TRACED ;wake_up_state (task, __TASK_TRACED); }unlock_task_sighand (task, &flags);
Signature · 1 line
2.34.1
Quoted 17 lines · Sven Schnelle
CI reported the following splat while running the strace testsuite:
[ 3976.640309] WARNING: CPU: 1 PID: 3570031 at kernel/ptrace.c:272 ptrace_check_attach+0x12e/0x178 [ 3976.640391] CPU: 1 PID: 3570031 Comm: strace Tainted: G OE 5.19.0-20220624.rc3.git0.ee819a77d4e7.300.fc36.s390x #1 [ 3976.640410] Hardware name: IBM 3906 M04 704 (z/VM 7.1.0) [ 3976.640452] Call Trace: [ 3976.640454] [<00000000ab4b645a>] ptrace_check_attach+0x132/0x178 [ 3976.640457] ([<00000000ab4b6450>] ptrace_check_attach+0x128/0x178) [ 3976.640460] [<00000000ab4b6cde>] __s390x_sys_ptrace+0x86/0x160 [ 3976.640463] [<00000000ac03fcec>] __do_syscall+0x1d4/0x200 [ 3976.640468] [<00000000ac04e312>] system_call+0x82/0xb0 [ 3976.640470] Last Breaking-Event-Address: [ 3976.640471] [<00000000ab4ea3c8>] wait_task_inactive+0x98/0x190This is because
JOBCTL_TRACEDis set, but the task is not inTASK_TRACEDstate. Caused byptrace_unfreeze_traced()which does:
Quoted 8 lines
task->jobctl&= ~TASK_TRACEDbut it should be:
task->jobctl&= ~JOBCTL_TRACEDFixes 31cae1eaae4f ("sched,signal,ptrace: Rework TASK_TRACED, TASK_STOPPED state")Signed-off-by Sven Schnelle <[email protected]>
Quoted 20 lines
--- kernel/ptrace.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)kernel/ptrace.c +1
-1@@ -222,7 +222,7 @@ static void ptrace_unfreeze_traced(struct task_struct *task)if (lock_task_sighand (task, &flags)) { task->jobctl &= ~JOBCTL_PTRACE_FROZEN ;if (__fatal_signal_pending (task)) { - task->jobctl &= ~TASK_TRACED ; + task->jobctl &= ~JOBCTL_TRACED ;wake_up_state (task, __TASK_TRACED); }unlock_task_sighand (task, &flags);Signature · 1 line
2.34.1
Oleg Nesterov
maintainerkernel/ptrace.c static void ptrace_unfreeze_traced(struct task_struct *task) · line 225
Quoted 9 lines · Sven Schnelle
kernel/ptrace.c +1
-1@@ -222,7 +222,7 @@ static void ptrace_unfreeze_traced(struct task_struct *task)if (lock_task_sighand (task, &flags)) { task->jobctl &= ~JOBCTL_PTRACE_FROZEN ;if (__fatal_signal_pending (task)) { - task->jobctl &= ~TASK_TRACED ; + task->jobctl &= ~JOBCTL_TRACED ;
Heh. I have read this code many times, but I'm afraid I could read it 1000 times more and didn't notice the problem ;)
Thanks!
Oleg.
Quoted 13 lines · Oleg Nesterov
kernel/ptrace.c static void ptrace_unfreeze_traced(struct task_struct *task) · line 225
Quoted 9 lines · Sven Schnelle
kernel/ptrace.c +1
-1@@ -222,7 +222,7 @@ static void ptrace_unfreeze_traced(struct task_struct *task)if (lock_task_sighand (task, &flags)) { task->jobctl &= ~JOBCTL_PTRACE_FROZEN ;if (__fatal_signal_pending (task)) { - task->jobctl &= ~TASK_TRACED ; + task->jobctl &= ~JOBCTL_TRACED ;Heh. I have read this code many times, but I'm afraid I could read it 1000 times more and didn't notice the problem ;)
Heh, same here, I've read it today and didn't spot the problem. Brains are weird.
Quoted 17 lines · Sven Schnelle
CI reported the following splat while running the strace testsuite:
[ 3976.640309] WARNING: CPU: 1 PID: 3570031 at kernel/ptrace.c:272 ptrace_check_attach+0x12e/0x178 [ 3976.640391] CPU: 1 PID: 3570031 Comm: strace Tainted: G OE 5.19.0-20220624.rc3.git0.ee819a77d4e7.300.fc36.s390x #1 [ 3976.640410] Hardware name: IBM 3906 M04 704 (z/VM 7.1.0) [ 3976.640452] Call Trace: [ 3976.640454] [<00000000ab4b645a>] ptrace_check_attach+0x132/0x178 [ 3976.640457] ([<00000000ab4b6450>] ptrace_check_attach+0x128/0x178) [ 3976.640460] [<00000000ab4b6cde>] __s390x_sys_ptrace+0x86/0x160 [ 3976.640463] [<00000000ac03fcec>] __do_syscall+0x1d4/0x200 [ 3976.640468] [<00000000ac04e312>] system_call+0x82/0xb0 [ 3976.640470] Last Breaking-Event-Address: [ 3976.640471] [<00000000ab4ea3c8>] wait_task_inactive+0x98/0x190This is because
JOBCTL_TRACEDis set, but the task is not inTASK_TRACEDstate. Caused byptrace_unfreeze_traced()which does:
Quoted 8 lines
task->jobctl&= ~TASK_TRACEDbut it should be:
task->jobctl&= ~JOBCTL_TRACEDFixes 31cae1eaae4f ("sched,signal,ptrace: Rework TASK_TRACED, TASK_STOPPED state")Signed-off-by Sven Schnelle <[email protected]>
Quoted 20 lines
--- kernel/ptrace.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)kernel/ptrace.c +1
-1@@ -222,7 +222,7 @@ static void ptrace_unfreeze_traced(struct task_struct *task)if (lock_task_sighand (task, &flags)) { task->jobctl &= ~JOBCTL_PTRACE_FROZEN ;if (__fatal_signal_pending (task)) { - task->jobctl &= ~TASK_TRACED ; + task->jobctl &= ~JOBCTL_TRACED ;wake_up_state (task, __TASK_TRACED); }unlock_task_sighand (task, &flags);Signature · 1 line
2.34.1
Quoted 14 lines · Sven Schnelle
CI reported the following splat while running the strace testsuite:
[ 3976.640309] WARNING: CPU: 1 PID: 3570031 at kernel/ptrace.c:272 ptrace_check_attach+0x12e/0x178 [ 3976.640391] CPU: 1 PID: 3570031 Comm: strace Tainted: G OE 5.19.0-20220624.rc3.git0.ee819a77d4e7.300.fc36.s390x #1 [ 3976.640410] Hardware name: IBM 3906 M04 704 (z/VM 7.1.0) [ 3976.640452] Call Trace: [ 3976.640454] [<00000000ab4b645a>] ptrace_check_attach+0x132/0x178 [ 3976.640457] ([<00000000ab4b6450>] ptrace_check_attach+0x128/0x178) [ 3976.640460] [<00000000ab4b6cde>] __s390x_sys_ptrace+0x86/0x160 [ 3976.640463] [<00000000ac03fcec>] __do_syscall+0x1d4/0x200 [ 3976.640468] [<00000000ac04e312>] system_call+0x82/0xb0 [ 3976.640470] Last Breaking-Event-Address: [ 3976.640471] [<00000000ab4ea3c8>] wait_task_inactive+0x98/0x190
Quoted 8 lines
This is because
JOBCTL_TRACEDis set, but the task is not inTASK_TRACEDstate. Caused byptrace_unfreeze_traced()which does:
task->jobctl&= ~TASK_TRACEDbut it should be:
task->jobctl&= ~JOBCTL_TRACED
That would definitely do it. I had to think about it for a few minutes to see how it explains some of the stranger behavior but it explains all of the funny behavior I have seen.
Thank you for tracking this down.
The fact the original bug report was on s390 had me somehow thinking this was s390 only.
I will double check everything get this in linux-next and then send this to Linus.
Eric
Quoted 19 lines
Fixes 31cae1eaae4f ("sched,signal,ptrace: Rework TASK_TRACED, TASK_STOPPED state")Signed-off-by Sven Schnelle <[email protected]>--- kernel/ptrace.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)kernel/ptrace.c +1
-1@@ -222,7 +222,7 @@ static void ptrace_unfreeze_traced(struct task_struct *task)if (lock_task_sighand (task, &flags)) { task->jobctl &= ~JOBCTL_PTRACE_FROZEN ;if (__fatal_signal_pending (task)) { - task->jobctl &= ~TASK_TRACED ; + task->jobctl &= ~JOBCTL_TRACED ;wake_up_state (task, __TASK_TRACED); }unlock_task_sighand (task, &flags);