From: Borislav Petkov <bp@alien8.de>
To: Ingo Molnar <mingo@kernel.org>
Cc: Brian Gerst <brgerst@gmail.com>,
Kees Cook <keescook@chromium.org>, Baoquan He <bhe@redhat.com>,
Yinghai Lu <yinghai@kernel.org>, Juergen Gross <jgross@suse.com>,
Thomas Garnier <thgarnie@google.com>,
Andy Lutomirski <luto@kernel.org>,
"H. Peter Anvin" <hpa@zytor.com>,
Alexander Kuleshov <kuleshovmail@gmail.com>,
Josh Poimboeuf <jpoimboe@redhat.com>,
Christian Borntraeger <borntraeger@de.ibm.com>,
Stephen Smalley <sds@tycho.nsa.gov>,
"Kirill A. Shutemov" <kirill.shutemov@linux.intel.com>,
Joerg Roedel <jroedel@suse.de>,
"Williams, Dan J" <dan.j.williams@intel.com>,
Mark Salter <msalter@redhat.com>, Borislav Petkov <bp@suse.de>,
Jonathan Corbet <corbet@lwn.net>,
Matt Fleming <matt@codeblueprint.co.uk>,
Xiao Guangrong <guangrong.xiao@linux.intel.com>,
"Aneesh Kumar K.V" <aneesh.kumar@linux.vnet.ibm.com>,
Linus Torvalds <torvalds@linux-foundation.org>,
Dave Hansen <dave.hansen@linux.intel.com>,
Toshi Kani <toshi.kani@hpe.com>,
Alexander Popov <alpopov@ptsecurity.com>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Jan Beulich <JBeulich@suse.com>,
Andrew Morton <akpm@linux-foundation.org>,
Boris Ostrovsky <boris.ostrovsky@oracle.com>,
Denys Vlasenko <dvlasenk@redhat.com>,
Peter Zijlstra <peterz@infradead.org>,
Dave Young <dyoung@redhat.com>,
Thomas Gleixner <tglx@linutronix.de>,
Dmitry Vyukov <dvyukov@google.com>, Lv Zheng <lv.zheng@intel.com>,
Martin Schwidefsky <schwidefsky@de.ibm.com>,
"linux-tip-commits@vger.kernel.org"
<linux-tip-commits@vger.kernel.org>
Subject: Re: [tip:x86/boot] x86/mm: Enable KASLR for physical mapping memory regions
Date: Wed, 17 Aug 2016 13:33:14 +0200 [thread overview]
Message-ID: <20160817113314.GA19221@nazgul.tnic> (raw)
In-Reply-To: <20160817101948.GA31863@gmail.com>
On Wed, Aug 17, 2016 at 12:19:48PM +0200, Ingo Molnar wrote:
> So I really hate this pattern, and we already have it in
> arch/x86/kernel/cpu/microcode/intel.c as well:
>
> start += PAGE_OFFSET - __PAGE_OFFSET_BASE;
>
> and note that it's not #ifdefed there - I think it's safe to leave out the #ifdef?
Ah, yes, we got rid of the ifdeffery in:
4a1a8e1b8f9f ("x86/asm, x86/microcode: Add __PAGE_OFFSET_BASE define on 32-bit")
So here's v2:
---
From: Borislav Petkov <bp@suse.de>
Date: Wed, 17 Aug 2016 08:23:29 +0200
Subject: [PATCH] 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 <brgerst@gmail.com>
Signed-off-by: Borislav Petkov <bp@suse.de>
Cc: Kees Cook <keescook@chromium.org>
---
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 27a0228c9cae..b816971f5da4 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);
--
2.8.4
--
Regards/Gruss,
Boris.
ECO tip #101: Trim your mails when you reply.
--
next prev parent reply other threads:[~2016-08-17 11:33 UTC|newest]
Thread overview: 50+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-06-22 0:46 [PATCH v7 0/9] x86/mm: memory area address KASLR Kees Cook
2016-06-22 0:46 ` [PATCH v7 1/9] x86/mm: Refactor KASLR entropy functions Kees Cook
2016-07-08 20:33 ` [tip:x86/boot] " tip-bot for Thomas Garnier
2016-06-22 0:46 ` [PATCH v7 2/9] x86/mm: Update physical mapping variable names (x86_64) Kees Cook
2016-07-08 20:34 ` [tip:x86/boot] x86/mm: Update physical mapping variable names tip-bot for Thomas Garnier
2016-06-22 0:47 ` [PATCH v7 3/9] x86/mm: PUD VA support for physical mapping (x86_64) Kees Cook
2016-07-08 20:34 ` [tip:x86/boot] x86/mm: Add PUD VA support for physical mapping tip-bot for Thomas Garnier
2016-06-22 0:47 ` [PATCH v7 4/9] x86/mm: Separate variable for trampoline PGD (x86_64) Kees Cook
2016-07-08 20:35 ` [tip:x86/boot] x86/mm: Separate variable for trampoline PGD tip-bot for Thomas Garnier
2016-06-22 0:47 ` [PATCH v7 5/9] x86/mm: Implement ASLR for kernel memory regions (x86_64) Kees Cook
2016-07-08 20:35 ` [tip:x86/boot] x86/mm: Implement ASLR for kernel memory regions tip-bot for Thomas Garnier
2016-06-22 0:47 ` [PATCH v7 6/9] x86/mm: Enable KASLR for physical mapping memory region (x86_64) Kees Cook
2016-07-08 20:35 ` [tip:x86/boot] x86/mm: Enable KASLR for physical mapping memory regions tip-bot for Thomas Garnier
2016-08-14 4:25 ` Brian Gerst
2016-08-14 23:26 ` Baoquan He
2016-08-16 11:31 ` Brian Gerst
2016-08-16 13:42 ` Borislav Petkov
2016-08-16 13:49 ` Borislav Petkov
2016-08-16 15:54 ` Borislav Petkov
2016-08-16 17:50 ` Borislav Petkov
2016-08-16 19:49 ` Kees Cook
2016-08-16 21:01 ` Borislav Petkov
2016-08-17 0:31 ` Brian Gerst
2016-08-17 9:11 ` Borislav Petkov
2016-08-17 10:19 ` Ingo Molnar
2016-08-17 11:33 ` Borislav Petkov [this message]
2016-08-18 10:49 ` [tip:x86/urgent] x86/microcode/AMD: Fix initrd loading with CONFIG_RANDOMIZE_MEMORY=y tip-bot for Borislav Petkov
2016-06-22 0:47 ` [PATCH v7 7/9] x86/mm: Enable KASLR for vmalloc memory region (x86_64) Kees Cook
2016-07-08 20:36 ` [tip:x86/boot] x86/mm: Enable KASLR for vmalloc memory regions tip-bot for Thomas Garnier
2016-06-22 0:47 ` [PATCH v7 8/9] x86/mm: Enable KASLR for vmemmap memory region (x86_64) Kees Cook
2016-06-22 0:47 ` [PATCH v7 9/9] x86/mm: Memory hotplug support for KASLR memory randomization (x86_64) Kees Cook
2016-07-08 20:36 ` [tip:x86/boot] x86/mm: Add memory hotplug support for KASLR memory randomization tip-bot for Thomas Garnier
2016-06-22 12:47 ` [kernel-hardening] [PATCH v7 0/9] x86/mm: memory area address KASLR Jason Cooper
2016-06-22 15:59 ` Thomas Garnier
2016-06-22 17:05 ` Kees Cook
2016-06-23 19:33 ` Jason Cooper
2016-06-23 19:45 ` Sandy Harris
2016-06-23 19:59 ` Kees Cook
2016-06-23 20:19 ` Jason Cooper
2016-06-23 20:16 ` Jason Cooper
2016-06-23 19:58 ` Kees Cook
2016-06-23 20:05 ` Ard Biesheuvel
2016-06-24 1:11 ` Jason Cooper
2016-06-24 10:54 ` Ard Biesheuvel
2016-06-24 16:02 ` devicetree random-seed properties, was: "Re: [PATCH v7 0/9] x86/mm: memory area address KASLR" Jason Cooper
2016-06-24 19:04 ` Kees Cook
2016-06-24 20:40 ` Andy Lutomirski
2016-06-30 21:48 ` Jason Cooper
2016-06-30 21:48 ` Jason Cooper
2016-07-07 22:24 ` [PATCH v7 0/9] x86/mm: memory area address KASLR Kees Cook
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20160817113314.GA19221@nazgul.tnic \
--to=bp@alien8.de \
--cc=JBeulich@suse.com \
--cc=akpm@linux-foundation.org \
--cc=alpopov@ptsecurity.com \
--cc=aneesh.kumar@linux.vnet.ibm.com \
--cc=bhe@redhat.com \
--cc=boris.ostrovsky@oracle.com \
--cc=borntraeger@de.ibm.com \
--cc=bp@suse.de \
--cc=brgerst@gmail.com \
--cc=corbet@lwn.net \
--cc=dan.j.williams@intel.com \
--cc=dave.hansen@linux.intel.com \
--cc=dvlasenk@redhat.com \
--cc=dvyukov@google.com \
--cc=dyoung@redhat.com \
--cc=guangrong.xiao@linux.intel.com \
--cc=hpa@zytor.com \
--cc=jgross@suse.com \
--cc=jpoimboe@redhat.com \
--cc=jroedel@suse.de \
--cc=keescook@chromium.org \
--cc=kirill.shutemov@linux.intel.com \
--cc=kuleshovmail@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=luto@kernel.org \
--cc=lv.zheng@intel.com \
--cc=matt@codeblueprint.co.uk \
--cc=mingo@kernel.org \
--cc=msalter@redhat.com \
--cc=peterz@infradead.org \
--cc=schwidefsky@de.ibm.com \
--cc=sds@tycho.nsa.gov \
--cc=tglx@linutronix.de \
--cc=thgarnie@google.com \
--cc=torvalds@linux-foundation.org \
--cc=toshi.kani@hpe.com \
--cc=yinghai@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).