[PATCH 3.16.y-ckt 172/254] x86, microcode: Fix accessing dis_ucode_ldr on 32-bit
Luis Henriques
luis.henriques at canonical.com
Tue Nov 25 10:38:42 UTC 2014
3.16.7-ckt2 -stable review patch. If anyone has any objections, please let me know.
------------------
From: Borislav Petkov <bp at suse.de>
commit 85be07c32496dc264661308e4d9d4e9ccaff8072 upstream.
We should be accessing it through a pointer, like on the BSP.
Tested-by: Richard Hendershot <rshendershot at mchsi.com>
Fixes: 65cef1311d5d ("x86, microcode: Add a disable chicken bit")
Signed-off-by: Borislav Petkov <bp at suse.de>
Signed-off-by: Luis Henriques <luis.henriques at canonical.com>
---
arch/x86/kernel/cpu/microcode/core_early.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/x86/kernel/cpu/microcode/core_early.c b/arch/x86/kernel/cpu/microcode/core_early.c
index 5f28a64e71ea..2c017f242a78 100644
--- a/arch/x86/kernel/cpu/microcode/core_early.c
+++ b/arch/x86/kernel/cpu/microcode/core_early.c
@@ -124,7 +124,7 @@ void __init load_ucode_bsp(void)
static bool check_loader_disabled_ap(void)
{
#ifdef CONFIG_X86_32
- return __pa_nodebug(dis_ucode_ldr);
+ return *((bool *)__pa_nodebug(&dis_ucode_ldr));
#else
return dis_ucode_ldr;
#endif
--
2.1.0
More information about the kernel-team
mailing list