From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1946643AbcHRKvJ (ORCPT ); Thu, 18 Aug 2016 06:51:09 -0400 Received: from terminus.zytor.com ([198.137.202.10]:57698 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1945943AbcHRKvH (ORCPT ); Thu, 18 Aug 2016 06:51:07 -0400 Date: Thu, 18 Aug 2016 03:49:58 -0700 From: tip-bot for Borislav Petkov Message-ID: Cc: brgerst@gmail.com, bp@alien8.de, linux-kernel@vger.kernel.org, bp@suse.de, tglx@linutronix.de, keescook@chromium.org, jpoimboe@redhat.com, dvlasenk@redhat.com, hpa@zytor.com, mingo@kernel.org, peterz@infradead.org, torvalds@linux-foundation.org, luto@kernel.org Reply-To: hpa@zytor.com, peterz@infradead.org, torvalds@linux-foundation.org, mingo@kernel.org, luto@kernel.org, jpoimboe@redhat.com, dvlasenk@redhat.com, tglx@linutronix.de, keescook@chromium.org, brgerst@gmail.com, bp@suse.de, bp@alien8.de, linux-kernel@vger.kernel.org In-Reply-To: <20160817113314.GA19221@nazgul.tnic> References: <20160817113314.GA19221@nazgul.tnic> To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/urgent] x86/microcode/AMD: Fix initrd loading with CONFIG_RANDOMIZE_MEMORY=y Git-Commit-ID: 88b2f634028f1f38dcc3d412e10ff1f224976daa X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: 88b2f634028f1f38dcc3d412e10ff1f224976daa Gitweb: http://git.kernel.org/tip/88b2f634028f1f38dcc3d412e10ff1f224976daa Author: Borislav Petkov AuthorDate: Wed, 17 Aug 2016 13:33:14 +0200 Committer: Ingo Molnar CommitDate: Thu, 18 Aug 2016 10:06:49 +0200 x86/microcode/AMD: Fix initrd loading with CONFIG_RANDOMIZE_MEMORY=y Similar to: efaad554b4ff ("x86/microcode/intel: Fix initrd loading with CONFIG_RANDOMIZE_MEMORY=y") ... fix microcode loading from the initrd on AMD by adding the randomization offset to the microcode patch container within the initrd. Reported-and-tested-by: Brian Gerst Signed-off-by: Borislav Petkov Cc: Andy Lutomirski Cc: Borislav Petkov Cc: Denys Vlasenko Cc: H. Peter Anvin Cc: Josh Poimboeuf Cc: Kees Cook Cc: Linus Torvalds Cc: Peter Zijlstra Cc: Thomas Gleixner Cc: linux-tip-commits@vger.kernel.org Link: http://lkml.kernel.org/r/20160817113314.GA19221@nazgul.tnic Signed-off-by: Ingo Molnar --- arch/x86/kernel/cpu/microcode/amd.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/arch/x86/kernel/cpu/microcode/amd.c b/arch/x86/kernel/cpu/microcode/amd.c index 27a0228..b816971 100644 --- a/arch/x86/kernel/cpu/microcode/amd.c +++ b/arch/x86/kernel/cpu/microcode/amd.c @@ -355,6 +355,7 @@ void load_ucode_amd_ap(void) unsigned int cpu = smp_processor_id(); struct equiv_cpu_entry *eq; struct microcode_amd *mc; + u8 *cont = container; u32 rev, eax; u16 eq_id; @@ -371,8 +372,11 @@ void load_ucode_amd_ap(void) if (check_current_patch_level(&rev, false)) return; + /* Add CONFIG_RANDOMIZE_MEMORY offset. */ + cont += PAGE_OFFSET - __PAGE_OFFSET_BASE; + eax = cpuid_eax(0x00000001); - eq = (struct equiv_cpu_entry *)(container + CONTAINER_HDR_SZ); + eq = (struct equiv_cpu_entry *)(cont + CONTAINER_HDR_SZ); eq_id = find_equiv_id(eq, eax); if (!eq_id) @@ -434,6 +438,9 @@ int __init save_microcode_in_initrd_amd(void) else container = cont_va; + /* Add CONFIG_RANDOMIZE_MEMORY offset. */ + container += PAGE_OFFSET - __PAGE_OFFSET_BASE; + eax = cpuid_eax(0x00000001); eax = ((eax >> 8) & 0xf) + ((eax >> 20) & 0xff);