ia64: ptrace_attach_sync_user_rbs: avoid "task->signal != NULL" checks
Oleg Nesterov
maintainerPATCH 2/2 ia64: ptrace_attach_sync_user_rbs: avoid "task->signal != NULL" checks
No functional changes.
It doesn't matter which pointer we check under tasklist to ensure the task was not released, ->signal or ->sighand. But we are going to make ->signal refcountable, change the code to use ->sighand.
Note: this code doesn't need this check and tasklist_lock at all, it should be converted to use lock_task_sighand(). And, the code under SIGNAL_STOP_STOPPED check looks wrong.
Signed-off-by Oleg Nesterov <[email protected]>
---
arch/ia64/kernel/ptrace.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/ia64/kernel/ptrace.c renamed from arch/ia64/kernel/ptrace.c~6_IA64_DONT_CHECK_SIGNAL +2 -2
@@ -639,7 +639,7 @@ ptrace_attach_sync_user_rbs (struct task*/ read_lock (&tasklist_lock); -if (child->signal) { +if (child->sighand) {spin_lock_irq (&child->sighand->siglock);if (child->state ==TASK_STOPPED && !test_and_set_tsk_thread_flag (child,TIF_RESTORE_RSE )) {
@@ -663,7 +663,7 @@ ptrace_attach_sync_user_rbs (struct task* job control stop, so that SIGCONT can be used to wake it up. */ read_lock (&tasklist_lock); -if (child->signal) { +if (child->sighand) {spin_lock_irq (&child->sighand->siglock);if (child->state ==TASK_TRACED && (child->signal->flags &SIGNAL_STOP_STOPPED )) {
Acked-by Roland McGrath <[email protected]>
Quoted 3 lines
Note: this code doesn't need this check and
tasklist_lockat all, it should be converted to uselock_task_sighand(). And, the code underSIGNAL_STOP_STOPPEDcheck looks wrong.
Agreed. It should match that part of ptrace_untrace().
Thanks,
Roland