From e7c09306ccb5a5f4a791302888d0ab238d7314ed Mon Sep 17 00:00:00 2001
From: Oleg Nesterov <oleg@tv-sign.ru>
Date: Wed, 15 Feb 2006 22:50:10 +0300
Subject: [PATCH] --- yaml --- r: 20339 b: refs/heads/master c:
 5ecfbae093f0c37311e89b29bfc0c9d586eace87 h: refs/heads/master i:   20337:
 dd663b5dcc1edce6fde27a962016092eb494a198   20335:
 4b17c9d80e29b3a17edbbebe4072b0d430feb087 v: v3

---
 [refs]                       |  2 +-
 trunk/fs/exec.c              |  2 +-
 trunk/include/linux/ptrace.h |  1 +
 trunk/kernel/ptrace.c        | 25 +++++++++++++++----------
 4 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/[refs] b/[refs]
index dec386b0c313..782a72facc0b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: dadac81b1b86196fcc48fb87620403c4a7174f06
+refs/heads/master: 5ecfbae093f0c37311e89b29bfc0c9d586eace87
diff --git a/trunk/fs/exec.c b/trunk/fs/exec.c
index 055378d2513e..0e1c95074d42 100644
--- a/trunk/fs/exec.c
+++ b/trunk/fs/exec.c
@@ -1403,7 +1403,7 @@ static void zap_threads (struct mm_struct *mm)
 		do_each_thread(g,p) {
 			if (mm == p->mm && p != tsk &&
 			    p->ptrace && p->parent->mm == mm) {
-				__ptrace_unlink(p);
+				__ptrace_detach(p, 0);
 			}
 		} while_each_thread(g,p);
 		write_unlock_irq(&tasklist_lock);
diff --git a/trunk/include/linux/ptrace.h b/trunk/include/linux/ptrace.h
index 9d5cd106b344..0d36750fc0f1 100644
--- a/trunk/include/linux/ptrace.h
+++ b/trunk/include/linux/ptrace.h
@@ -84,6 +84,7 @@ extern int ptrace_readdata(struct task_struct *tsk, unsigned long src, char __us
 extern int ptrace_writedata(struct task_struct *tsk, char __user *src, unsigned long dst, int len);
 extern int ptrace_attach(struct task_struct *tsk);
 extern int ptrace_detach(struct task_struct *, unsigned int);
+extern void __ptrace_detach(struct task_struct *, unsigned int);
 extern void ptrace_disable(struct task_struct *);
 extern int ptrace_check_attach(struct task_struct *task, int kill);
 extern int ptrace_request(struct task_struct *child, long request, long addr, long data);
diff --git a/trunk/kernel/ptrace.c b/trunk/kernel/ptrace.c
index d2cf144d0af5..d95a72c9279d 100644
--- a/trunk/kernel/ptrace.c
+++ b/trunk/kernel/ptrace.c
@@ -72,8 +72,8 @@ void ptrace_untrace(task_t *child)
  */
 void __ptrace_unlink(task_t *child)
 {
-	if (!child->ptrace)
-		BUG();
+	BUG_ON(!child->ptrace);
+
 	child->ptrace = 0;
 	if (!list_empty(&child->ptrace_list)) {
 		list_del_init(&child->ptrace_list);
@@ -184,22 +184,27 @@ int ptrace_attach(struct task_struct *task)
 	return retval;
 }
 
+void __ptrace_detach(struct task_struct *child, unsigned int data)
+{
+	child->exit_code = data;
+	/* .. re-parent .. */
+	__ptrace_unlink(child);
+	/* .. and wake it up. */
+	if (child->exit_state != EXIT_ZOMBIE)
+		wake_up_process(child);
+}
+
 int ptrace_detach(struct task_struct *child, unsigned int data)
 {
 	if (!valid_signal(data))
-		return	-EIO;
+		return -EIO;
 
 	/* Architecture-specific hardware disable .. */
 	ptrace_disable(child);
 
-	/* .. re-parent .. */
-	child->exit_code = data;
-
 	write_lock_irq(&tasklist_lock);
-	__ptrace_unlink(child);
-	/* .. and wake it up. */
-	if (child->exit_state != EXIT_ZOMBIE)
-		wake_up_process(child);
+	if (child->ptrace)
+		__ptrace_detach(child, data);
 	write_unlock_irq(&tasklist_lock);
 
 	return 0;