Merge branch 'upstream' of git://git.infradead.org/users/pcmoore/audit

[deliverable/linux.git] / kernel / ptrace.c

diff --git a/kernel/ptrace.c b/kernel/ptrace.c
index 9a34bd80a745d23989fe6bcac5a5b7d4bdbb693b..c8e0e050a36afb0ccb875e13d9f2b526b0af4d29 100644 (file)
--- a/kernel/ptrace.c
+++ b/kernel/ptrace.c
@@ -456,8 +456,6 @@ static bool __ptrace_detach(struct task_struct *tracer, struct task_struct *p)
 
 static int ptrace_detach(struct task_struct *child, unsigned int data)
 {
-       bool dead = false;
-
        if (!valid_signal(data))
                return -EIO;
 
@@ -467,18 +465,19 @@ static int ptrace_detach(struct task_struct *child, unsigned int data)
 
        write_lock_irq(&tasklist_lock);
        /*
-        * This child can be already killed. Make sure de_thread() or
-        * our sub-thread doing do_wait() didn't do release_task() yet.
+        * We rely on ptrace_freeze_traced(). It can't be killed and
+        * untraced by another thread, it can't be a zombie.
         */
-       if (child->ptrace) {
-               child->exit_code = data;
-               dead = __ptrace_detach(current, child);
-       }
+       WARN_ON(!child->ptrace || child->exit_state);
+       /*
+        * tasklist_lock avoids the race with wait_task_stopped(), see
+        * the comment in ptrace_resume().
+        */
+       child->exit_code = data;
+       __ptrace_detach(current, child);
        write_unlock_irq(&tasklist_lock);
 
        proc_ptrace_connector(child, PTRACE_DETACH);
-       if (unlikely(dead))
-               release_task(child);
 
        return 0;
 }