1 files changed, 6 insertions, 5 deletions

diff --git a/kernel/ptrace.c b/kernel/ptrace.c
index 628b03ab88a5..fdb34e86f923 100644
--- a/kernel/ptrace.c
+++ b/kernel/ptrace.c
@@ -99,10 +99,12 @@ int ptrace_check_attach(struct task_struct *child, int kill)
          * be changed by us so it's not changing right after this.
          */
         read_lock(&tasklist_lock);
-        if ((child->ptrace & PT_PTRACED) && child->parent == current &&
-            (!(child->ptrace & PT_ATTACHED) || child->real_parent != current)
-            && child->signal != NULL) {
+        if ((child->ptrace & PT_PTRACED) && child->parent == current) {
                 ret = 0;
+                /*
+                 * child->sighand can't be NULL, release_task()
+                 * does ptrace_unlink() before __exit_signal().
+                 */
                 spin_lock_irq(&child->sighand->siglock);
                 if (task_is_stopped(child))
                         child->state = TASK_TRACED;
@@ -200,8 +202,7 @@ repeat:
                 goto bad;
 
         /* Go */
-        task->ptrace |= PT_PTRACED | ((task->real_parent != current)
-                                      ? PT_ATTACHED : 0);
+        task->ptrace |= PT_PTRACED;
         if (capable(CAP_SYS_PTRACE))
                 task->ptrace |= PT_PTRACE_CAP;