Commit f9d81f61 authored by Oleg Nesterov's avatar Oleg Nesterov Committed by Linus Torvalds

ptrace: PTRACE_LISTEN forgets to unlock ->siglock

If PTRACE_LISTEN fails after lock_task_sighand() it doesn't drop ->siglock.
Reported-by: default avatarMatt Fleming <matt.fleming@intel.com>
Signed-off-by: default avatarOleg Nesterov <oleg@redhat.com>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent b172e38e
...@@ -744,20 +744,17 @@ int ptrace_request(struct task_struct *child, long request, ...@@ -744,20 +744,17 @@ int ptrace_request(struct task_struct *child, long request,
break; break;
si = child->last_siginfo; si = child->last_siginfo;
if (unlikely(!si || si->si_code >> 8 != PTRACE_EVENT_STOP)) if (likely(si && (si->si_code >> 8) == PTRACE_EVENT_STOP)) {
break;
child->jobctl |= JOBCTL_LISTENING; child->jobctl |= JOBCTL_LISTENING;
/* /*
* If NOTIFY is set, it means event happened between start * If NOTIFY is set, it means event happened between
* of this trap and now. Trigger re-trap immediately. * start of this trap and now. Trigger re-trap.
*/ */
if (child->jobctl & JOBCTL_TRAP_NOTIFY) if (child->jobctl & JOBCTL_TRAP_NOTIFY)
signal_wake_up(child, true); signal_wake_up(child, true);
unlock_task_sighand(child, &flags);
ret = 0; ret = 0;
}
unlock_task_sighand(child, &flags);
break; break;
case PTRACE_DETACH: /* detach a process that was attached. */ case PTRACE_DETACH: /* detach a process that was attached. */
......
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