Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux

[mirror_ubuntu-bionic-kernel.git] / kernel / ptrace.c

diff --git a/kernel/ptrace.c b/kernel/ptrace.c
index 54e75226c2c490d04fb1d57c9c441c93ea8c0af0..1eb9d90c3af926b3217a44b8355a10733a73bd7e 100644 (file)
--- a/kernel/ptrace.c
+++ b/kernel/ptrace.c
@@ -485,36 +485,19 @@ static int ptrace_detach(struct task_struct *child, unsigned int data)
 
 /*
  * Detach all tasks we were using ptrace on. Called with tasklist held
- * for writing, and returns with it held too. But note it can release
- * and reacquire the lock.
+ * for writing.
  */
-void exit_ptrace(struct task_struct *tracer)
-       __releases(&tasklist_lock)
-       __acquires(&tasklist_lock)
+void exit_ptrace(struct task_struct *tracer, struct list_head *dead)
 {
        struct task_struct *p, *n;
-       LIST_HEAD(ptrace_dead);
-
-       if (likely(list_empty(&tracer->ptraced)))
-               return;
 
        list_for_each_entry_safe(p, n, &tracer->ptraced, ptrace_entry) {
                if (unlikely(p->ptrace & PT_EXITKILL))
                        send_sig_info(SIGKILL, SEND_SIG_FORCED, p);
 
                if (__ptrace_detach(tracer, p))
-                       list_add(&p->ptrace_entry, &ptrace_dead);
-       }
-
-       write_unlock_irq(&tasklist_lock);
-       BUG_ON(!list_empty(&tracer->ptraced));
-
-       list_for_each_entry_safe(p, n, &ptrace_dead, ptrace_entry) {
-               list_del_init(&p->ptrace_entry);
-               release_task(p);
+                       list_add(&p->ptrace_entry, dead);
        }
-
-       write_lock_irq(&tasklist_lock);
 }
 
 int ptrace_readdata(struct task_struct *tsk, unsigned long src, char __user *dst, int len)