Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit aeee90df authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 273b2578 5861bbfc

include/linux/ptrace.h

+1 −1
Original line number Diff line number Diff line
@@ -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);

	}

}

include/linux/tracehook.h

+1 −1
Original line number Diff line number Diff line
@@ -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.

		 */