aboutsummaryrefslogtreecommitdiff
path: root/include/linux
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2008-08-07 18:14:24 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2008-08-07 18:14:24 -0700
commitaeee90dfa01844168cd7f8051d0a0f969c573067 (patch)
treef7a62a16a1484321ce5b4306d5e5f7fa8819243c /include/linux
parent273b2578392bbf6e5c47a8a3d1ee461ce6fc7182 (diff)
parent5861bbfcc10fc0358abf52c7d22850c8d180f0b0 (diff)
Merge branch 'tracehook' of git://git.kernel.org/pub/scm/linux/kernel/git/frob/linux-2.6-utrace
* 'tracehook' of git://git.kernel.org/pub/scm/linux/kernel/git/frob/linux-2.6-utrace: tracehook: fix CLONE_PTRACE
Diffstat (limited to 'include/linux')
-rw-r--r--include/linux/ptrace.h2
-rw-r--r--include/linux/tracehook.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/ptrace.h b/include/linux/ptrace.h
index fd31756e1a0..ea7416c901d 100644
--- a/include/linux/ptrace.h
+++ b/include/linux/ptrace.h
@@ -172,7 +172,7 @@ static inline void ptrace_init_task(struct task_struct *child, bool ptrace)
child->ptrace = 0;
if (unlikely(ptrace)) {
child->ptrace = current->ptrace;
- __ptrace_link(child, current->parent);
+ ptrace_link(child, current->parent);
}
}
diff --git a/include/linux/tracehook.h b/include/linux/tracehook.h
index ab3ef7aefa9..b48d8196957 100644
--- a/include/linux/tracehook.h
+++ b/include/linux/tracehook.h
@@ -280,7 +280,7 @@ static inline void tracehook_report_clone(int trace, struct pt_regs *regs,
unsigned long clone_flags,
pid_t pid, struct task_struct *child)
{
- if (unlikely(trace)) {
+ if (unlikely(trace) || unlikely(clone_flags & CLONE_PTRACE)) {
/*
* The child starts up with an immediate SIGSTOP.
*/