projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'upstream-fixes'
[powerpc.git]
/
kernel
/
ptrace.c
diff --git
a/kernel/ptrace.c
b/kernel/ptrace.c
index
5b8dd98
..
17ee7e5
100644
(file)
--- a/
kernel/ptrace.c
+++ b/
kernel/ptrace.c
@@
-155,7
+155,7
@@
int ptrace_attach(struct task_struct *task)
retval = -EPERM;
if (task->pid <= 1)
goto bad;
retval = -EPERM;
if (task->pid <= 1)
goto bad;
- if (task
== current
)
+ if (task
->tgid == current->tgid
)
goto bad;
/* the same process cannot be attached many times */
if (task->ptrace & PT_PTRACED)
goto bad;
/* the same process cannot be attached many times */
if (task->ptrace & PT_PTRACED)
@@
-470,7
+470,7
@@
asmlinkage long sys_ptrace(long request, long pid, long addr, long data)
if (request == PTRACE_ATTACH) {
ret = ptrace_attach(child);
if (request == PTRACE_ATTACH) {
ret = ptrace_attach(child);
- goto out;
+ goto out
_put_task_struct
;
}
ret = ptrace_check_attach(child, request == PTRACE_KILL);
}
ret = ptrace_check_attach(child, request == PTRACE_KILL);