leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ptrace: PTRACE_LISTEN forgets to unlock ->siglock

Browse Source 
If PTRACE_LISTEN fails after lock_task_sighand() it doesn't drop ->siglock.

Reported-by: Matt Fleming <matt.fleming@intel.com>
Signed-off-by: Oleg Nesterov <oleg@redhat.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Oleg Nesterov 2011-09-25 19:46:22 +02:00 committed by Linus Torvalds
parent b172e38e43
commit f9d81f61c8
1 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
kernel/ptrace.c
View File

@ -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 of this trap and now. Trigger re-trap.
/* */
* If NOTIFY is set, it means event happened between start if (child->jobctl & JOBCTL_TRAP_NOTIFY)
* of this trap and now. Trigger re-trap immediately. signal_wake_up(child, true);
*/ ret = 0;
if (child->jobctl & JOBCTL_TRAP_NOTIFY) }
signal_wake_up(child, true);
unlock_task_sighand(child, &flags); unlock_task_sighand(child, &flags);
ret = 0;
break; break;
case PTRACE_DETACH: /* detach a process that was attached. */ case PTRACE_DETACH: /* detach a process that was attached. */