[kernel] r12043 - in dists/etch-security/linux-2.6.24/debian: . patches/bugfix patches/series

[Dann Frazier]

Author: dannf
Date: Tue Aug 12 08:39:56 2008
New Revision: 12043

Log:
Fix regression introduced upstream by the fix for CVE-2008-0598

Added:
   dists/etch-security/linux-2.6.24/debian/patches/bugfix/x86-wrong-register-was-used-in-align-macro.patch
   dists/etch-security/linux-2.6.24/debian/patches/series/6~etchnhalf.5
Modified:
   dists/etch-security/linux-2.6.24/debian/changelog

Modified: dists/etch-security/linux-2.6.24/debian/changelog
==============================================================================
--- dists/etch-security/linux-2.6.24/debian/changelog	(original)
+++ dists/etch-security/linux-2.6.24/debian/changelog	Tue Aug 12 08:39:56 2008
@@ -1,8 +1,9 @@
 linux-2.6.24 (2.6.24-6~etchnhalf.5) UNRELEASED; urgency=high
 
   * Add ABI files for 2.6.24-etchnhalf.1
+  * Fix regression introduced upstream by the fix for CVE-2008-0598
 
- -- dann frazier <dannf at debian.org>  Tue, 12 Aug 2008 02:18:04 -0600
+ -- dann frazier <dannf at debian.org>  Tue, 12 Aug 2008 02:27:51 -0600
 
 linux-2.6.24 (2.6.24-6~etchnhalf.4) stable; urgency=low
 

Added: dists/etch-security/linux-2.6.24/debian/patches/bugfix/x86-wrong-register-was-used-in-align-macro.patch
==============================================================================
--- (empty file)
+++ dists/etch-security/linux-2.6.24/debian/patches/bugfix/x86-wrong-register-was-used-in-align-macro.patch	Tue Aug 12 08:39:56 2008
@@ -0,0 +1,49 @@
+commit afd962a9e8708c571c5c0c4a6d098f931742c229
+Author: Vitaly Mayatskikh <v.mayatskih at gmail.com>
+Date:   Wed Jul 30 13:30:14 2008 +0200
+
+    x86: wrong register was used in align macro
+    
+    New ALIGN_DESTINATION macro has sad typo: r8d register was used instead
+    of ecx in fixup section. This can be considered as a regression.
+    
+    Register ecx was also wrongly loaded with value in r8d in
+    copy_user_nocache routine.
+    
+    Signed-off-by: Vitaly Mayatskikh <v.mayatskih at gmail.com>
+    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
+
+diff --git a/arch/x86/lib/copy_user_64.S b/arch/x86/lib/copy_user_64.S
+index dfdf428..f118c11 100644
+--- a/arch/x86/lib/copy_user_64.S
++++ b/arch/x86/lib/copy_user_64.S
+@@ -52,7 +52,7 @@
+ 	jnz 100b
+ 102:
+ 	.section .fixup,"ax"
+-103:	addl %r8d,%edx			/* ecx is zerorest also */
++103:	addl %ecx,%edx			/* ecx is zerorest also */
+ 	jmp copy_user_handle_tail
+ 	.previous
+ 
+diff --git a/arch/x86/lib/copy_user_nocache_64.S b/arch/x86/lib/copy_user_nocache_64.S
+index 40e0e30..cb0c112 100644
+--- a/arch/x86/lib/copy_user_nocache_64.S
++++ b/arch/x86/lib/copy_user_nocache_64.S
+@@ -32,7 +32,7 @@
+ 	jnz 100b
+ 102:
+ 	.section .fixup,"ax"
+-103:	addl %r8d,%edx			/* ecx is zerorest also */
++103:	addl %ecx,%edx			/* ecx is zerorest also */
+ 	jmp copy_user_handle_tail
+ 	.previous
+ 
+@@ -108,7 +108,6 @@ ENTRY(__copy_user_nocache)
+ 	jmp 60f
+ 50:	movl %ecx,%edx
+ 60:	sfence
+-	movl %r8d,%ecx
+ 	jmp copy_user_handle_tail
+ 	.previous
+ 

Added: dists/etch-security/linux-2.6.24/debian/patches/series/6~etchnhalf.5
==============================================================================
--- (empty file)
+++ dists/etch-security/linux-2.6.24/debian/patches/series/6~etchnhalf.5	Tue Aug 12 08:39:56 2008
@@ -0,0 +1 @@
++ bugfix/x86-wrong-register-was-used-in-align-macro.patch