Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git

[linux-2.6] / kernel / ptrace.c

diff --git a/kernel/ptrace.c b/kernel/ptrace.c
index b88d4186cd7ac2733c3adf231d5b4daa4e14b0a9..17ee7e5a34516f7485250b7a7ef94546907f9b39 100644 (file)
--- a/kernel/ptrace.c
+++ b/kernel/ptrace.c
@@ -470,7 +470,7 @@ asmlinkage long sys_ptrace(long request, long pid, long addr, long data)
 
        if (request == PTRACE_ATTACH) {
                ret = ptrace_attach(child);
-               goto out;
+               goto out_put_task_struct;
        }
 
        ret = ptrace_check_attach(child, request == PTRACE_KILL);