From 16f15ab515c1ee582d1ec73e6ddf73ad2808137f Mon Sep 17 00:00:00 2001 From: Oleg Nesterov Date: Sun, 25 Sep 2011 19:46:22 +0200 Subject: [PATCH] --- yaml --- r: 264110 b: refs/heads/master c: f9d81f61c84aca693bc353dfef4b8c36c2e5e1b5 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/kernel/ptrace.c | 23 ++++++++++------------- 2 files changed, 11 insertions(+), 14 deletions(-) diff --git a/[refs] b/[refs] index bd9d7c5f8f68..b5ff79c9fc92 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b172e38e435a158cc84169d5b9127a8dd8d21e76 +refs/heads/master: f9d81f61c84aca693bc353dfef4b8c36c2e5e1b5 diff --git a/trunk/kernel/ptrace.c b/trunk/kernel/ptrace.c index 9de3ecfd20f9..a70d2a5d8c7b 100644 --- a/trunk/kernel/ptrace.c +++ b/trunk/kernel/ptrace.c @@ -744,20 +744,17 @@ int ptrace_request(struct task_struct *child, long request, break; si = child->last_siginfo; - if (unlikely(!si || si->si_code >> 8 != PTRACE_EVENT_STOP)) - break; - - child->jobctl |= JOBCTL_LISTENING; - - /* - * If NOTIFY is set, it means event happened between start - * of this trap and now. Trigger re-trap immediately. - */ - if (child->jobctl & JOBCTL_TRAP_NOTIFY) - signal_wake_up(child, true); - + if (likely(si && (si->si_code >> 8) == PTRACE_EVENT_STOP)) { + child->jobctl |= JOBCTL_LISTENING; + /* + * If NOTIFY is set, it means event happened between + * start of this trap and now. Trigger re-trap. + */ + if (child->jobctl & JOBCTL_TRAP_NOTIFY) + signal_wake_up(child, true); + ret = 0; + } unlock_task_sighand(child, &flags); - ret = 0; break; case PTRACE_DETACH: /* detach a process that was attached. */