summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2006-08-06 20:51:25 -0500
committerGreg Kroah-Hartman <gregkh@suse.de>2006-08-18 09:25:51 -0700
commit35a472de81cfdb37f3cfb49fde4987d99b81f996 (patch)
treec085909700afcbf1751dc80d4580fe8c015398ee
parentd246e8b2f241c3b4670dc9779c7494606676210a (diff)
downloadlwn-35a472de81cfdb37f3cfb49fde4987d99b81f996.tar.gz
lwn-35a472de81cfdb37f3cfb49fde4987d99b81f996.zip
[PATCH] 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>
-rw-r--r--arch/powerpc/kernel/cpu_setup_power4.S2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/powerpc/kernel/cpu_setup_power4.S b/arch/powerpc/kernel/cpu_setup_power4.S
index b61d86e7ceb6..55f367eddb69 100644
--- a/arch/powerpc/kernel/cpu_setup_power4.S
+++ b/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