[kernel] r7787 - in dists/sarge-security/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian: . patches patches/series

[Dann Frazier]

Author: dannf
Date: Mon Nov 13 06:19:48 2006
New Revision: 7787

Added:
   dists/sarge-security/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/238_ppc-hid0-dos.diff
Modified:
   dists/sarge-security/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/changelog
   dists/sarge-security/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/series/2.4.27-10sarge5
Log:
* 238_ppc-hid0-dos.diff
  [SECURITY] [ppc] Fix local DoS by clearing HID0 attention enable on
  PPC970 at boot time
  See CVE-2006-4093

Modified: dists/sarge-security/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/changelog
==============================================================================
--- dists/sarge-security/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/changelog	(original)
+++ dists/sarge-security/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/changelog	Mon Nov 13 06:19:48 2006
@@ -24,8 +24,12 @@
     permissions from the remote server. This is a behavior change from
     woody that users likely will not expect, so disabling.
     Closes: #310982
+  * 238_ppc-hid0-dos.diff
+    [SECURITY] [ppc] Fix local DoS by clearing HID0 attention enable on
+    PPC970 at boot time
+    See CVE-2006-4093
 
- -- dann frazier <dannf at debian.org>  Sun, 12 Nov 2006 21:12:42 -0700
+ -- dann frazier <dannf at debian.org>  Sun, 12 Nov 2006 22:17:21 -0700
 
 kernel-source-2.4.27 (2.4.27-10sarge4) stable-security; urgency=high
 

Added: dists/sarge-security/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/238_ppc-hid0-dos.diff
==============================================================================
--- (empty file)
+++ dists/sarge-security/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/238_ppc-hid0-dos.diff	Mon Nov 13 06:19:48 2006
@@ -0,0 +1,28 @@
+From: Willy Tarreau <w at 1wt.eu>
+Date: Sat, 19 Aug 2006 05:58:09 +0000 (+0200)
+Subject: [PATCH] powerpc: Clear HID0 attention enable on PPC970 at boot time
+X-Git-Tag: v2.4.34-pre2
+X-Git-Url: http://www.kernel.org/git/?p=linux/kernel/git/wtarreau/linux-2.4.git;a=commitdiff;h=2efe3d6e83c281e21ce2fedc409416222e29c175
+
+[PATCH] powerpc: Clear HID0 attention enable on PPC970 at boot time
+
+Clear HID0[en_attn] at CPU init time on PPC970.  Closes CVE-2006-4093.
+Back-ported from 2.6 after notification from Adrian Bunk and Greg KH.
+
+Original 2.6 patch Signed-off-by: Olof Johansson <olof at lixom.net>
+below :
+
+  http://kernel.org/git/?p=linux/kernel/git/stable/linux-2.6.17.y.git;a=commit;h=35a472de81cfdb37f3cfb49fde4987d99b81f996
+---
+
+--- a/arch/ppc/kernel/head.S
++++ b/arch/ppc/kernel/head.S
+@@ -1705,6 +1705,8 @@ ppc970_setup_hid:
+ 	mfspr	r0,SPRN_HID0
+ 	li	r11,5			/* clear DOZE and SLEEP */
+ 	rldimi	r0,r11,52,8		/* and set NAP and DPM */
++	li	r11,0
++	rldimi	r0,r11,32,31		/* clear EN_ATTN */
+ 	mtspr	SPRN_HID0,r0
+ 	mfspr	r0,SPRN_HID0
+ 	mfspr	r0,SPRN_HID0

Modified: dists/sarge-security/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/series/2.4.27-10sarge5
==============================================================================
--- dists/sarge-security/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/series/2.4.27-10sarge5	(original)
+++ dists/sarge-security/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/series/2.4.27-10sarge5	Mon Nov 13 06:19:48 2006
@@ -3,3 +3,4 @@
 + 235_ppc-alignment-exception-table-check.diff
 + 236_s390-uaccess-memleak.diff
 + 237_smbfs-no-cap-unix.diff
++ 238_ppc-hid0-dos.diff