r3937 - in trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian: . patches patches/series

[Simon Horman]

Author: horms
Date: 2005-08-17 04:52:36 +0000 (Wed, 17 Aug 2005)
New Revision: 3937

Added:
   trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/184_arch-x86_64-ia32-ptrace32-oops.diff
   trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/series/2.4.27-12
Modified:
   trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/changelog
Log:
+    [Security, x86_64] 32 bit ltrace oops when tracing 64 bit executable
+    http://lkml.org/lkml/2005/1/5/245
+    http://linux.bkbits.net:8080/linux-2.4/cset@41dd3455GwQPufrGvBJjcUOXQa3WXA 

Modified: trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/changelog
===================================================================
--- trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/changelog	2005-08-17 04:44:13 UTC (rev 3936)
+++ trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/changelog	2005-08-17 04:52:36 UTC (rev 3937)
@@ -1,3 +1,13 @@
+kernel-source-2.4.27 (2.4.27-12) UNRELEASED; urgency=low
+
+  [ Simon Horman ]
+  * 184_arch-x86_64-ia32-ptrace32-oops.diff
+    [Security, x86_64] 32 bit ltrace oops when tracing 64 bit executable
+    http://lkml.org/lkml/2005/1/5/245
+    http://linux.bkbits.net:8080/linux-2.4/cset@41dd3455GwQPufrGvBJjcUOXQa3WXA
+
+ -- Simon Horman <horms at debian.org>  Wed, 17 Aug 2005 13:50:40 +0900
+
 kernel-source-2.4.27 (2.4.27-11) unstable; urgency=low
 
   [ Simon Horman ]

Added: trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/184_arch-x86_64-ia32-ptrace32-oops.diff
===================================================================
--- trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/184_arch-x86_64-ia32-ptrace32-oops.diff	2005-08-17 04:44:13 UTC (rev 3936)
+++ trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/184_arch-x86_64-ia32-ptrace32-oops.diff	2005-08-17 04:52:36 UTC (rev 3937)
@@ -0,0 +1,37 @@
+diff -Naru a/arch/x86_64/ia32/ptrace32.c b/arch/x86_64/ia32/ptrace32.c
+--- a/arch/x86_64/ia32/ptrace32.c	2005-08-16 21:49:44 -07:00
++++ b/arch/x86_64/ia32/ptrace32.c	2005-08-16 21:49:44 -07:00
+@@ -185,12 +185,12 @@
+ 			goto out;
+ 		*err = ptrace_check_attach(child, request == PTRACE_KILL); 
+ 		if (*err < 0) 
+-				goto out;
++			goto out;
+ 		return child; 
+-	} 
+ 
+  out:
+-	free_task_struct(child);
++		free_task_struct(child);
++	} 
+ 	return NULL; 
+ 	
+ } 
+# This is a BitKeeper generated diff -Nru style patch.
+#
+# ChangeSet
+#   2005/01/06 10:51:33-02:00 mbellon at mvista.com 
+#   [PATCH] 32 bit ltrace oops when tracing 64 bit executable [X86_64]
+#   
+#   Didn't see  a fix for this so here it is. Tried using "ltrace -i" on a
+#   64 bit executable when ltrace was a 32 bit executable. The kernel threw
+#   an oops.
+#   
+#   The find_target routine (arch/x86/ia32/ptrace32.c) doesn't deal with a
+#   NULL return from  find_task_by_pid properly - if NULL is returned
+#   put_task_struct() is still called.
+# 
+# arch/x86_64/ia32/ptrace32.c
+#   2005/01/06 12:29:52-02:00 mbellon at mvista.com +3 -3
+#   32 bit ltrace oops when tracing 64 bit executable [X86_64]
+# 

Added: trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/series/2.4.27-12
===================================================================
--- trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/series/2.4.27-12	2005-08-17 04:44:13 UTC (rev 3936)
+++ trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/series/2.4.27-12	2005-08-17 04:52:36 UTC (rev 3937)
@@ -0,0 +1 @@
++ 184_arch-x86_64-ia32-ptrace32-oops.diff