diff options
| author | Borislav Petkov <bp@suse.de> | 2014-11-05 17:28:06 +0100 |
|---|---|---|
| committer | Borislav Petkov <bp@suse.de> | 2014-11-05 17:28:06 +0100 |
| commit | 85be07c32496dc264661308e4d9d4e9ccaff8072 (patch) | |
| tree | cc620328baf4c7ca6b555a3b06dfdd40675e2512 | |
| parent | e6023367d779060fddc9a52d1f474085b2b36298 (diff) | |
| download | linux-stable-85be07c32496dc264661308e4d9d4e9ccaff8072.tar.gz linux-stable-85be07c32496dc264661308e4d9d4e9ccaff8072.tar.bz2 linux-stable-85be07c32496dc264661308e4d9d4e9ccaff8072.zip | |
x86, microcode: Fix accessing dis_ucode_ldr on 32-bit
We should be accessing it through a pointer, like on the BSP.
Tested-by: Richard Hendershot <rshendershot@mchsi.com>
Fixes: 65cef1311d5d ("x86, microcode: Add a disable chicken bit")
Cc: <stable@vger.kernel.org> # v3.15+
Signed-off-by: Borislav Petkov <bp@suse.de>
| -rw-r--r-- | arch/x86/kernel/cpu/microcode/core_early.c | 2 |
1 files changed, 1 insertions, 1 deletions
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 |