Author: maks-guest
Date: Sat Nov 4 18:36:16 2006
New Revision: 7692
Added:
dists/trunk/linux-2.6/debian/patches/bugfix/s390-ftbfs-2.6.18.1.patch
Modified:
dists/trunk/linux-2.6/debian/changelog
dists/trunk/linux-2.6/debian/patches/series/4
Log:
revert s390 2.6.18.1 uaccess.S fix for now
Modified: dists/trunk/linux-2.6/debian/changelog
==============================================================================
--- dists/trunk/linux-2.6/debian/changelog (original)
+++ dists/trunk/linux-2.6/debian/changelog Sat Nov 4 18:36:16 2006
@@ -112,6 +112,8 @@
- uml: make Uml compile on FC6 kernel headers
- Fix potential interrupts during alternative patching
* Backport atkbd - supress "too many keys" error message.
+ * [s390] Revert temporarly 2.6.18.1 "S390: user readable uninitialised
+ kernel memory (CVE-2006-5174)" fix as it causes ftfbs
[ Sven Luther ]
* [powerpc] Added exception alignement patch from Benjamin Herrenschmidt.
@@ -155,7 +157,7 @@
- bugfix/mips/dec-serial.patch, replaces mips-dec-serial.patch, fix
serial console handling on DECstations.
- -- maximilian attems <[EMAIL PROTECTED]> Sat, 4 Nov 2006 14:46:21 +0100
+ -- maximilian attems <[EMAIL PROTECTED]> Sat, 4 Nov 2006 18:31:52 +0100
linux-2.6 (2.6.18-3) unstable; urgency=low
Added: dists/trunk/linux-2.6/debian/patches/bugfix/s390-ftbfs-2.6.18.1.patch
==============================================================================
--- (empty file)
+++ dists/trunk/linux-2.6/debian/patches/bugfix/s390-ftbfs-2.6.18.1.patch
Sat Nov 4 18:36:16 2006
@@ -0,0 +1,42 @@
+--- linux-2.6-2.6.18/arch/s390/lib/uaccess.S 2006-11-04 18:27:41.000000000
+0100
++++ linux-2.6-2.6.18/arch/s390/lib/uaccess.S.orig 2006-11-04
18:27:14.000000000 +0100
+@@ -40,17 +40,7 @@ __copy_from_user_asm:
+ # move with the reduced length which is < 256
+ 5: mvcp 0(%r5,%r2),0(%r4),%r0
+ slr %r3,%r5
+- alr %r2,%r5
+-6: lgr %r5,%r3 # copy remaining size
+- ahi %r5,-1 # subtract 1 for xc loop
+- bras %r4,8f
+- xc 0(1,%2),0(%2)
+-7: xc 0(256,%2),0(%2)
+- la %r2,256(%r2)
+-8: ahji %r5,-256
+- jnm 7b
+- ex %r5,0(%r2)
+-9: lr %r2,%r3
++6: lr %r2,%r3
+ br %r14
+ .section __ex_table,"a"
+ .long 0b,4b
+--- linux-2.6-2.6.18/arch/s390/lib/uaccess64.S 2006-11-04 18:27:41.000000000
+0100
++++ linux-2.6-2.6.18/arch/s390/lib/uaccess64.S.orig 2006-11-04
18:27:24.000000000 +0100
+@@ -40,17 +40,7 @@ __copy_from_user_asm:
+ # move with the reduced length which is < 256
+ 5: mvcp 0(%r5,%r2),0(%r4),%r0
+ slgr %r3,%r5
+- algr %r2,%r5
+-6: lgr %r5,%r3 # copy remaining size
+- aghi %r5,-1 # subtract 1 for xc loop
+- bras %r4,8f
+- xc 0(1,%r2),0(%r2)
+-7: xc 0(256,%r2),0(%r2)
+- la %r2,256(%r2)
+-8: aghi %r5,-256
+- jnm 7b
+- ex %r5,0(%r2)
+-9: lgr %r2,%r3
++6: lgr %r2,%r3
+ br %r14
+ .section __ex_table,"a"
+ .quad 0b,4b
Modified: dists/trunk/linux-2.6/debian/patches/series/4
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/series/4 (original)
+++ dists/trunk/linux-2.6/debian/patches/series/4 Sat Nov 4 18:36:16 2006
@@ -46,3 +46,4 @@
+ bugfix/2.6.18.2
+ bugfix/arm/iop3xx-mtd-map-fix.patch
+ features/input-atkb-supress-too-may-keys.patch
++ bugfix/s390-ftbfs-2.6.18.1.patch
_______________________________________________
Kernel-svn-changes mailing list
[email protected]
http://lists.alioth.debian.org/mailman/listinfo/kernel-svn-changes
