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
This commit is contained in:
commit
aeee90dfa0
|
@ -172,7 +172,7 @@ static inline void ptrace_init_task(struct task_struct *child, bool ptrace)
|
||||||
child->ptrace = 0;
|
child->ptrace = 0;
|
||||||
if (unlikely(ptrace)) {
|
if (unlikely(ptrace)) {
|
||||||
child->ptrace = current->ptrace;
|
child->ptrace = current->ptrace;
|
||||||
__ptrace_link(child, current->parent);
|
ptrace_link(child, current->parent);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -280,7 +280,7 @@ static inline void tracehook_report_clone(int trace, struct pt_regs *regs,
|
||||||
unsigned long clone_flags,
|
unsigned long clone_flags,
|
||||||
pid_t pid, struct task_struct *child)
|
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.
|
* The child starts up with an immediate SIGSTOP.
|
||||||
*/
|
*/
|
||||||
|
|
Loading…
Reference in New Issue