Skip to contentSkip to conversation

ptrace: fix possible zombie leak on PTRACE_DETACH

PATCH In review Oleg Nesterov 2 participants 3 messages Jan 29, 2009 – Feb 5, 2009 ptrace support

lore
Share & tools
lore

Oleg Nesterov

author maintainer
#0 lore raw

PATCH 4/4 ptrace: fix possible zombie leak on PTRACE_DETACH

When ptrace_detach() takes tasklist, the tracee can be SIGKILL'ed. If it has already passed exit_notify() we can leak a zombie, because
a) ptracing disables the auto-reaping logic, and b) ->real_parent was not notified about the child's death.

ptrace_detach() should follow the ptrace_exit's logic, change the code accordingly.

include/linux/ptrace.h renamed from include/linux/ptrace.h~4_DETACH_FIX_ZOMBIE_LEAK +1 -0
@@ -94,6 +94,7 @@ extern void ptrace_notify(int exit_code)
 extern void __ptrace_link(struct task_struct *child,
 			  struct task_struct *new_parent);
 extern void __ptrace_unlink(struct task_struct *child);
+extern int __ptrace_detach(struct task_struct *tracer, struct task_struct *p);
 extern void ptrace_fork(struct task_struct *task, unsigned long clone_flags);
 #define PTRACE_MODE_READ   1
 #define PTRACE_MODE_ATTACH 2
kernel/ptrace.c renamed from kernel/ptrace.c~4_DETACH_FIX_ZOMBIE_LEAK +7 -2
@@ -237,6 +237,8 @@ out:
 
 int ptrace_detach(struct task_struct *child, unsigned int data)
 {
+	int dead = 0;
+
 	if (!valid_signal(data))
 		return -EIO;
 
@@ -244,18 +246,21 @@ int ptrace_detach(struct task_struct *ch
 	ptrace_disable(child);
 	clear_tsk_thread_flag(child, TIF_SYSCALL_TRACE);
 
-	/* protect against de_thread()->release_task() */
 	write_lock_irq(&tasklist_lock);
+	/* protect against de_thread()->release_task() */
 	if (child->ptrace) {
 		child->exit_code = data;
 
-		__ptrace_unlink(child);
+		dead = __ptrace_detach(current, child);
 
 		if (!child->exit_state)
 			wake_up_process(child);
 	}
 	write_unlock_irq(&tasklist_lock);
 
+	if (unlikely(dead))
+		release_task(child);
+
 	return 0;
 }
 
#1 lore raw

ACK on the change, though looks different if you put __ptrace_detach in ptrace.c with the earliar patch, as I suggest. Also, I think this warrants a comment for the release_task call mentioning briefly what it means:

	/*
	 * The flag means __ptrace_detach() determined that this child
	 * was a zombie that should have been auto-reaped already.
	 * Don't leak it.
	 */
	if (unlikely(dead))
		release_task(child);

Thanks,
Roland

author maintainer
#2 lore raw
Quoted 5 lines · Roland McGrath

ACK on the change, though looks different if you put __ptrace_detach in ptrace.c with the earliar patch, as I suggest. Also, I think this warrants a comment for the release_task call mentioning briefly what it means:

Quoted 7 lines
	/*
	 * The flag means __ptrace_detach() determined that this child
	 * was a zombie that should have been auto-reaped already.
	 * Don't leak it.
	 */
	if (unlikely(dead))
		release_task(child);

OK, will add this to the cleanup patch too.

Oleg.