x86/asm, x86/microcode: Add __PAGE_OFFSET_BASE define on 32-bit

... in order to avoid #ifdeffery in code computing the ASLR randomization
offset. Remove that #ifdeffery in the microcode loader.

Suggested-by: Kees Cook <[email protected]>
Signed-off-by: Borislav Petkov <[email protected]>
Cc: Linus Torvalds <[email protected]>
Cc: Nicolai Stange <[email protected]>
Cc: Peter Zijlstra <[email protected]>
Cc: Thomas Garnier <[email protected]>
Cc: Thomas Gleixner <[email protected]>
Link: http://lkml.kernel.org/r/[email protected]
Signed-off-by: Ingo Molnar <[email protected]>

diff --git a/arch/x86/include/asm/page_32_types.h b/arch/x86/include/asm/page_32_types.h
index 3a52ee0e726d4ca2643ff6b0dec4675f39e296b5..3bae4969ac65d771c2e86a134278d3c56e1835b7 100644 (file)
--- a/arch/x86/include/asm/page_32_types.h
+++ b/arch/x86/include/asm/page_32_types.h
@@ -13,7 +13,8 @@
  * If you want more physical memory than this then see the CONFIG_HIGHMEM4G
  * and CONFIG_HIGHMEM64G options in the kernel configuration.
  */
-#define __PAGE_OFFSET          _AC(CONFIG_PAGE_OFFSET, UL)
+#define __PAGE_OFFSET_BASE     _AC(CONFIG_PAGE_OFFSET, UL)
+#define __PAGE_OFFSET          __PAGE_OFFSET_BASE
 
 #define __START_KERNEL_map     __PAGE_OFFSET
 

diff --git a/arch/x86/kernel/cpu/microcode/intel.c b/arch/x86/kernel/cpu/microcode/intel.c
index 0f97ae93441bf31d1f31a464bfee9f0adfc442fe..cdc0deab00c9ff3615da88a4591d8701a661768a 100644 (file)
--- a/arch/x86/kernel/cpu/microcode/intel.c
+++ b/arch/x86/kernel/cpu/microcode/intel.c
@@ -818,13 +818,11 @@ void load_ucode_intel_ap(void)
        if (blobs_p->valid) {
                start = blobs_p->start;
 
-#ifdef CONFIG_RANDOMIZE_MEMORY
                /*
                 * Pay attention to CONFIG_RANDOMIZE_MEMORY=y as it shuffles
                 * physmem mapping too and there we have the initrd.
                 */
                start += PAGE_OFFSET - __PAGE_OFFSET_BASE;
-#endif
        }
 
        collect_cpu_info_early(&uci);