summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2006-08-06 20:51:25 -0500
committerPaul Mackerras <paulus@samba.org>2006-08-18 07:23:29 +1000
commit9a936a2e0526089194159eae31238e36b1c19e74 (patch)
treefbc8063ccd2c78eeb135047f5a603b6f0d7b8959
parente5c14ce118ab6a96afb2af5c4ec9727b03ab1936 (diff)
downloadlinux-3.10-9a936a2e0526089194159eae31238e36b1c19e74.tar.gz
linux-3.10-9a936a2e0526089194159eae31238e36b1c19e74.tar.bz2
linux-3.10-9a936a2e0526089194159eae31238e36b1c19e74.zip
[POWERPC] powerpc: Clear HID0 attention enable on PPC970 at boot time
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>
-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 f69af2c5d7b..76e97aa71c4 100644
--- a/arch/powerpc/kernel/cpu_setup_power4.S
+++ b/arch/powerpc/kernel/cpu_setup_power4.S
@@ -76,6 +76,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