From: Greg Kroah-Hartman Date: Wed, 16 Nov 2005 06:13:18 +0000 (-0800) Subject: refresh ptrace patch from Linus. X-Git-Tag: v2.6.14.3~13 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=564d7fcf745fb4e4036cdea5cca94e1a4c7a077e;p=thirdparty%2Fkernel%2Fstable-queue.git refresh ptrace patch from Linus. --- diff --git a/review/fix-ptrace-self-attach-rule.patch b/review/fix-ptrace-self-attach-rule.patch index 9300c5c1b0f..1afcebc2188 100644 --- a/review/fix-ptrace-self-attach-rule.patch +++ b/review/fix-ptrace-self-attach-rule.patch @@ -9,11 +9,12 @@ we should check that the thread group ID matches instead. Signed-off-by: Linus Torvalds --- -diff --git a/kernel/ptrace.c b/kernel/ptrace.c -index 5b8dd98..b88d418 100644 ---- a/kernel/ptrace.c -+++ b/kernel/ptrace.c -@@ -155,7 +155,7 @@ int ptrace_attach(struct task_struct *ta + kernel/ptrace.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- linux-2.6.14.y.orig/kernel/ptrace.c ++++ linux-2.6.14.y/kernel/ptrace.c +@@ -152,7 +152,7 @@ int ptrace_attach(struct task_struct *ta retval = -EPERM; if (task->pid <= 1) goto bad; @@ -22,4 +23,3 @@ index 5b8dd98..b88d418 100644 goto bad; /* the same process cannot be attached many times */ if (task->ptrace & PT_PTRACED) -