]> git.ipfire.org Git - thirdparty/kernel/stable-queue.git/commitdiff
2.6.17.9 release v2.6.17.9
authorGreg Kroah-Hartman <gregkh@suse.de>
Fri, 18 Aug 2006 18:05:52 +0000 (11:05 -0700)
committerGreg Kroah-Hartman <gregkh@suse.de>
Fri, 18 Aug 2006 18:05:52 +0000 (11:05 -0700)
releases/2.6.17.9/powerpc-clear-hid0-attention-enable-on-ppc970-at-boot-time.patch [new file with mode: 0644]

diff --git a/releases/2.6.17.9/powerpc-clear-hid0-attention-enable-on-ppc970-at-boot-time.patch b/releases/2.6.17.9/powerpc-clear-hid0-attention-enable-on-ppc970-at-boot-time.patch
new file mode 100644 (file)
index 0000000..e6550b5
--- /dev/null
@@ -0,0 +1,26 @@
+From foo@baz Tue Apr  9 12:12:43 2002
+From: Olof Johansson <olof@lixom.net>
+Date: Sun, Aug 6 20:51:25 2006 -0500
+Subject: [POWERPC] powerpc: Clear HID0 attention enable on PPC970 at boot time (CVE-2006-4093)
+
+Clear HID0[en_attn] at CPU init time on PPC970.  Closes CVE-2006-4093.
+
+Signed-off-by: Olof Johansson <olof@lixom.net>
+Signed-off-by: Paul Mackerras <paulus@samba.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+
+---
+ arch/powerpc/kernel/cpu_setup_power4.S |    2 ++
+ 1 file changed, 2 insertions(+)
+
+--- linux-2.6.17.8.orig/arch/powerpc/kernel/cpu_setup_power4.S
++++ linux-2.6.17.8/arch/powerpc/kernel/cpu_setup_power4.S
+@@ -94,6 +94,8 @@ _GLOBAL(__setup_cpu_ppc970)
+       mfspr   r0,SPRN_HID0
+       li      r11,5                   /* clear DOZE and SLEEP */
+       rldimi  r0,r11,52,8             /* 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