lkml.org 
[lkml]   [2014]   [Nov]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
Date
From
SubjectRe: [PATCH 3.16.y-ckt 172/254] x86, microcode: Fix accessing dis_ucode_ldr on 32-bit
On Tue, Nov 25, 2014 at 10:38:42AM +0000, Luis Henriques wrote:
> 3.16.7-ckt2 -stable review patch. If anyone has any objections, please let me know.
>

As requested on the stable mailing-list, I'm dropping this patch from
the 3.16 queue.

Cheers,
--
Luís

> ------------------
>
> From: Borislav Petkov <bp@suse.de>
>
> commit 85be07c32496dc264661308e4d9d4e9ccaff8072 upstream.
>
> 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")
> Signed-off-by: Borislav Petkov <bp@suse.de>
> Signed-off-by: Luis Henriques <luis.henriques@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
>


\
 
 \ /
  Last update: 2014-11-27 13:01    [W:0.718 / U:0.644 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site