x86 fixes
Subsystems (7)
Linus,
Please pull the latest x86-urgent-for-linus git tree from:
git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git x86-urgent-for-linus
# HEAD: 570e1aa84c376ff39809442f09c7606ddf62cfd1 x86/mm/ASLR: Avoid PAGE_SIZE redefinition for UML subarch
This tree contains:
- EFI fixes
- a boot printout fix
- ASLR/kASLR fixes
- intel microcode driver fixes
- other misc fixes
Most of the linecount comes from an EFI revert.
out-of-topic modifications in x86-urgent-for-linus:
-----------------------------------------------------
drivers/firmware/efi/libstub/efi-stub-helper.c# 43a9f69692b2: Revert "efi/libstub: Call ge
fs/binfmt_elf.c # 4e7c22d447bb: x86, mm/ASLR: Fix stack rand
Thanks,
Ingo
------------------>
Alexander Kuleshov (1):
Documentation/x86: Fix path in zero-page.txt
Dave Hansen (1):
x86/mm/init: Fix incorrect page size in init_memory_mapping() printks
Hector Marco-Gisbert (1):
x86, mm/ASLR: Fix stack randomization on 64-bit systems
Jiri Kosina (2):
x86/mm/ASLR: Propagate base load address calculation x86/mm/ASLR: Avoid PAGE_SIZE redefinition for UML subarch
Matt Fleming (2):
x86/efi: Avoid triple faults during EFI mixed mode calls Revert "efi/libstub: Call get_memory_map() to obtain map and desc sizes"
Quentin Casasnovas (2):
x86/microcode/intel: Guard against stack overflow in the loader x86/microcode/intel: Handle truncated microcode images more robustly
Ricardo Ribalda Delgado (1):
x86/apic: Fix the devicetree build in certain configs
Documentation/x86/zero-page.txt | 2 +- arch/x86/boot/compressed/Makefile | 1 + arch/x86/boot/compressed/aslr.c | 34 ++++- arch/x86/boot/compressed/efi_stub_64.S | 25 ---- arch/x86/boot/compressed/efi_thunk_64.S | 196 +++++++++++++++++++++++++ arch/x86/boot/compressed/misc.c | 3 +- arch/x86/boot/compressed/misc.h | 6 +- arch/x86/include/asm/apic.h | 8 + arch/x86/include/asm/page_types.h | 2 + arch/x86/include/uapi/asm/bootparam.h | 1 + arch/x86/kernel/cpu/microcode/intel.c | 5 + arch/x86/kernel/cpu/microcode/intel_early.c | 6 +- arch/x86/kernel/module.c | 10 +- arch/x86/kernel/setup.c | 22 ++- arch/x86/mm/init.c | 28 +++- arch/x86/mm/mmap.c | 6 +- arch/x86/platform/efi/efi_stub_64.S | 161 -------------------- arch/x86/platform/efi/efi_thunk_64.S | 121 ++++++++++++--- drivers/firmware/efi/libstub/efi-stub-helper.c | 16 +- fs/binfmt_elf.c | 5 +- 20 files changed, 419 insertions(+), 239 deletions(-) create mode 100644 arch/x86/boot/compressed/efi_thunk_64.S
Documentation/x86/zero-page.txt +1 -1
@@ -3,7 +3,7 @@ protocol of kernel. These should be filled by bootloader or 16-bit real-mode setup code of the kernel. References/settings to it mainly are in: - arch/x86/include/asm/bootparam.h + arch/x86/include/uapi/asm/bootparam.h Offset Proto Name Meaning
arch/x86/boot/compressed/Makefile +1 -0
@@ -49,6 +49,7 @@ $(obj)/eboot.o: KBUILD_CFLAGS += -fshort-wchar -mno-red-zone vmlinux-objs-$(CONFIG_EFI_STUB) += $(obj)/eboot.o $(obj)/efi_stub_$(BITS).o \ $(objtree)/drivers/firmware/efi/libstub/lib.a +vmlinux-objs-$(CONFIG_EFI_MIXED) += $(obj)/efi_thunk_$(BITS).o $(obj)/vmlinux: $(vmlinux-objs-y) FORCE $(call if_changed,ld)
arch/x86/boot/compressed/aslr.c +33 -1
@@ -14,6 +14,13 @@static const char build_str[] =UTS_RELEASE " (" LINUX_COMPILE_BY "@" LINUX_COMPILE_HOST ") (" LINUX_COMPILER ") " UTS_VERSION ; +struct kaslr_setup_data { +__u64 next; +__u32 type; +__u32 len; +__u8 data[1 ]; +} kaslr_setup_data; +#define I8254_PORT_CONTROL 0x43#define I8254_PORT_COUNTER0 0x40#define I8254_CMD_READBACK 0xC0
@@ -295,7 +302,29 @@ static unsigned long find_random_addr(unsigned long minimum,return slots_fetch_random (); } -unsigned char *choose_kernel_location (unsigned char *input, +static void add_kaslr_setup_data (struct boot_params *params,__u8 enabled) +{ +struct setup_data *data; + + kaslr_setup_data.type =SETUP_KASLR ; + kaslr_setup_data.len =1 ; + kaslr_setup_data.next =0 ; + kaslr_setup_data.data[0 ] = enabled; + + data = (struct setup_data *)(unsigned long )params->hdr.setup_data; + +while (data && data->next) + data = (struct setup_data *)(unsigned long )data->next; + +if (data) + data->next = (unsigned long )&kaslr_setup_data; +else + params->hdr.setup_data = (unsigned long )&kaslr_setup_data; + +} + +unsigned char *choose_kernel_location (struct boot_params *params, +unsigned char *input,unsigned long input_size,unsigned char *output,unsigned long output_size)
@@ -306,14 +335,17 @@ unsigned char *choose_kernel_location(unsigned char *input,#ifdef CONFIG_HIBERNATION if (!cmdline_find_option_bool ("kaslr" )) {debug_putstr ("KASLR disabled by default...\n" ); +add_kaslr_setup_data (params,0 ); goto out; }#else if (cmdline_find_option_bool ("nokaslr" )) {debug_putstr ("KASLR disabled by cmdline...\n" ); +add_kaslr_setup_data (params,0 ); goto out; }#endif +add_kaslr_setup_data (params,1 );/* Record the various known unsafe memory ranges. */ mem_avoid_init((unsigned long)input, input_size,
arch/x86/boot/compressed/efi_stub_64.S +0 -25
@@ -3,28 +3,3 @@ #include <asm/processor-flags.h> #include "../../platform/efi/efi_stub_64.S" - -#ifdef CONFIG_EFI_MIXED - .code64 - .text -ENTRY(efi64_thunk) - push %rbp - push %rbx - - subq $16, %rsp - leaq efi_exit32(%rip), %rax - movl %eax, 8(%rsp) - leaq efi_gdt64(%rip), %rax - movl %eax, 4(%rsp) - movl %eax, 2(%rax) /* Fixup the gdt base address */ - leaq efi32_boot_gdt(%rip), %rax - movl %eax, (%rsp) - - call __efi64_thunk - - addq $16, %rsp - pop %rbx - pop %rbp - ret -ENDPROC(efi64_thunk) -#endif /* CONFIG_EFI_MIXED */
arch/x86/boot/compressed/efi_thunk_64.S new file +196 -0
196 lines not on this page · raw message
arch/x86/boot/compressed/misc.c +2 -1
@@ -401,7 +401,8 @@ asmlinkage __visible void *decompress_kernel(void *rmode, memptr heap,* the entire decompressed kernel plus relocation table, or the * entire decompressed kernel plus .bss and .brk sections. */ - output =choose_kernel_location (input_data, input_len, output, + output =choose_kernel_location (real_mode, input_data, input_len, + output, output_len > run_size ? output_len : run_size);
arch/x86/boot/compressed/misc.h +4 -2
@@ -56,7 +56,8 @@ int cmdline_find_option_bool(const char *option);#if CONFIG_RANDOMIZE_BASE /* aslr.c */ -unsigned char *choose_kernel_location (unsigned char *input, +unsigned char *choose_kernel_location (struct boot_params *params, +unsigned char *input,unsigned long input_size,unsigned char *output,unsigned long output_size);
@@ -64,7 +65,8 @@ unsigned char *choose_kernel_location(unsigned char *input,bool has_cpuflag (int flag);#else static inline -unsigned char *choose_kernel_location (unsigned char *input, +unsigned char *choose_kernel_location (struct boot_params *params, +unsigned char *input,unsigned long input_size,unsigned char *output,unsigned long output_size)
arch/x86/include/asm/apic.h +8 -0
@@ -213,7 +213,15 @@ void register_lapic_address(unsigned long address);extern void setup_boot_APIC_clock (void );extern void setup_secondary_APIC_clock (void );extern int APIC_init_uniprocessor (void ); + +#ifdef CONFIG_X86_64 +static inline int apic_force_enable (unsigned long addr) +{ +return -1 ; +} +#else extern int apic_force_enable (unsigned long addr); +#endif extern int apic_bsp_setup (bool upmode);extern void apic_ap_setup (void );
arch/x86/include/asm/page_types.h +2 -0
@@ -51,6 +51,8 @@ extern int devmem_is_allowed(unsigned long pagenr);extern unsigned long max_low_pfn_mapped;extern unsigned long max_pfn_mapped; +extern bool kaslr_enabled; +static inline phys_addr_t get_max_mapped (void ) {return (phys_addr_t )max_pfn_mapped <<PAGE_SHIFT ;
arch/x86/include/uapi/asm/bootparam.h +1 -0
@@ -7,6 +7,7 @@#define SETUP_DTB 2#define SETUP_PCI 3#define SETUP_EFI 4 +#define SETUP_KASLR 5/* ram_size flags */ #define RAMDISK_IMAGE_START_MASK 0x07FF
arch/x86/kernel/cpu/microcode/intel.c +5 -0
@@ -196,6 +196,11 @@ static enum ucode_state generic_load_microcode(int cpu, void *data, size_t size,struct microcode_header_intel mc_header;unsigned int mc_size; +if (leftover <sizeof (mc_header)) { +pr_err ("error! Truncated header in microcode data file\n" ); +break ; + } +if (get_ucode_data (&mc_header, ucode_ptr,sizeof (mc_header)))break ;
arch/x86/kernel/cpu/microcode/intel_early.c +5 -1
@@ -321,7 +321,11 @@ get_matching_model_microcode(int cpu, unsigned long start,unsigned int mc_saved_count = mc_saved_data->mc_saved_count;int i; -while (leftover) { +while (leftover && mc_saved_count <ARRAY_SIZE (mc_saved_tmp)) { + +if (leftover <sizeof (mc_header)) +break ; + mc_header = (struct microcode_header_intel *)ucode_ptr; mc_size =get_totalsize (mc_header);
arch/x86/kernel/module.c +1 -9
@@ -46,21 +46,13 @@ do { \#ifdef CONFIG_RANDOMIZE_BASE static unsigned long module_load_offset; -static int randomize_modules =1 ;/* Mutex protects the module_load_offset. */ static DEFINE_MUTEX (module_kaslr_mutex); -static int __init parse_nokaslr (char *p) -{ - randomize_modules =0 ; -return 0 ; -} -early_param ("nokaslr" , parse_nokaslr); -static unsigned long int get_module_load_offset (void ) { -if (randomize_modules) { +if (kaslr_enabled) {mutex_lock (&module_kaslr_mutex);/* * Calculate the module_load_offset the first time this
arch/x86/kernel/setup.c +18 -4
@@ -121,6 +121,8 @@unsigned long max_low_pfn_mapped;unsigned long max_pfn_mapped; +bool __read_mostly kaslr_enabled = false; +#ifdef CONFIG_DMI RESERVE_BRK (dmi_alloc,65536 );#endif
@@ -424,6 +426,11 @@ static void __init reserve_initrd(void) }#endif /* CONFIG_BLK_DEV_INITRD */ +static void __init parse_kaslr_setup (u64 pa_data,u32 data_len) +{ + kaslr_enabled = (bool )(pa_data +sizeof (struct setup_data )); +} +static void __init parse_setup_data (void ) {struct setup_data *data;
@@ -449,6 +456,9 @@ static void __init parse_setup_data(void)case SETUP_EFI :parse_efi_setup (pa_data, data_len);break ; +case SETUP_KASLR : +parse_kaslr_setup (pa_data, data_len); +break ;default :break ; }
@@ -831,10 +841,14 @@ static void __init trim_low_memory_range(void)static int dump_kernel_offset (struct notifier_block *self,unsigned long v,void *p) { -pr_emerg ("Kernel Offset: 0x%lx from 0x%lx " -"(relocation range: 0x%lx-0x%lx)\n" , - (unsigned long )&_text - __START_KERNEL, __START_KERNEL, - __START_KERNEL_map,MODULES_VADDR -1 ); +if (kaslr_enabled) +pr_emerg ("Kernel Offset: 0x%lx from 0x%lx (relocation range: 0x%lx-0x%lx)\n" , + (unsigned long )&_text - __START_KERNEL, + __START_KERNEL, + __START_KERNEL_map, +MODULES_VADDR -1 ); +else +pr_emerg ("Kernel Offset: disabled\n" );return 0 ; }
arch/x86/mm/init.c +26 -2
@@ -238,6 +238,31 @@ static void __init_refok adjust_range_page_size_mask(struct map_range *mr, } } +static const char *page_size_string (struct map_range *mr) +{ +static const char str_1g[] ="1G" ; +static const char str_2m[] ="2M" ; +static const char str_4m[] ="4M" ; +static const char str_4k[] ="4k" ; + +if (mr->page_size_mask & (1 <<PG_LEVEL_1G )) +return str_1g; +/* +* 32-bit without PAE has a 4M large page size. +* PG_LEVEL_2M is misnamed, but we can at least +* print out the right size in the string. +*/ +if (IS_ENABLED (CONFIG_X86_32 ) && + !IS_ENABLED (CONFIG_X86_PAE ) && + mr->page_size_mask & (1 <<PG_LEVEL_2M )) +return str_4m; + +if (mr->page_size_mask & (1 <<PG_LEVEL_2M )) +return str_2m; + +return str_4k; +} +static int __meminit split_mem_range (struct map_range *mr,int nr_range,unsigned long start,unsigned long end)
@@ -333,8 +358,7 @@ static int __meminit split_mem_range(struct map_range *mr, int nr_range,for (i =0 ; i < nr_range; i++)printk (KERN_DEBUG " [mem %#010lx-%#010lx] page %s\n" , mr[i].start, mr[i].end -1 , - (mr[i].page_size_mask & (1 <<PG_LEVEL_1G ))?"1G" :( - (mr[i].page_size_mask & (1 <<PG_LEVEL_2M ))?"2M" :"4k" )); +page_size_string (&mr[i]));return nr_range; }
arch/x86/mm/mmap.c +3 -3
@@ -35,12 +35,12 @@ struct va_alignment __read_mostly va_align = { .flags = -1, }; -static unsigned int stack_maxrandom_size (void ) +static unsigned long stack_maxrandom_size (void ) { -unsigned int max =0 ; +unsigned long max =0 ;if ((current->flags &PF_RANDOMIZE ) && !(current->personality &ADDR_NO_RANDOMIZE )) { - max = ((-1U ) &STACK_RND_MASK ) <<PAGE_SHIFT ; + max = ((-1UL ) &STACK_RND_MASK ) <<PAGE_SHIFT ; }return max;
arch/x86/platform/efi/efi_stub_64.S +0 -161
167 lines not on this page · raw message
arch/x86/platform/efi/efi_thunk_64.S +104 -17
141 lines not on this page · raw message
drivers/firmware/efi/libstub/efi-stub-helper.c +6 -10
@@ -66,29 +66,25 @@ efi_status_t efi_get_memory_map(efi_system_table_t *sys_table_arg,unsigned long key;u32 desc_version; - *map_size =0 ; - *desc_size =0 ; - key =0 ; - status =efi_call_early (get_memory_map, map_size,NULL , - &key, desc_size, &desc_version); -if (status !=EFI_BUFFER_TOO_SMALL ) -return EFI_LOAD_ERROR ; - + *map_size =sizeof (*m) *32 ; +again:/* * Add an additional efi_memory_desc_t because we're doing an * allocation which may be in a new descriptor region. */ - *map_size += *desc_size; + *map_size +=sizeof (*m); status =efi_call_early (allocate_pool,EFI_LOADER_DATA , *map_size, (void **)&m);if (status !=EFI_SUCCESS ) goto fail; + *desc_size =0 ; + key =0 ; status =efi_call_early (get_memory_map, map_size, m, &key, desc_size, &desc_version);if (status ==EFI_BUFFER_TOO_SMALL ) {efi_call_early (free_pool, m); -return EFI_LOAD_ERROR ; + goto again; }if (status !=EFI_SUCCESS )
fs/binfmt_elf.c +3 -2
@@ -645,11 +645,12 @@ static unsigned long load_elf_interp(struct elfhdr *interp_elf_ex,static unsigned long randomize_stack_top (unsigned long stack_top) { -unsigned int random_variable =0 ; +unsigned long random_variable =0 ;if ((current->flags &PF_RANDOMIZE ) && !(current->personality &ADDR_NO_RANDOMIZE )) { - random_variable =get_random_int () &STACK_RND_MASK ; + random_variable = (unsigned long )get_random_int (); + random_variable &=STACK_RND_MASK ; random_variable <<=PAGE_SHIFT ; }#ifdef CONFIG_STACK_GROWSUP