x86 EFI fixes for v3.14-rc3
Hi Linus,
A few more EFI-related fixes.
The following changes since commit 4640c7ee9b8953237d05a61ea3ea93981d1bc961:
x86, smap: smap_violation() is bogus if CONFIG_X86_SMAP is off (2014-02-13 08:40:52 -0800)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git x86-urgent-for-linus
for you to fetch changes up to 31fce91e7afc25c666276f65f019bc13fd27e216:
Merge remote-tracking branch 'efi/urgent' into x86/urgent (2014-02-14 11:11:18 -0800)
----------------------------------------------------------------
Borislav Petkov (1):
x86/efi: Fix 32-bit fallout
H. Peter Anvin (1):
Merge remote-tracking branch 'efi/urgent' into x86/urgent
Matt Fleming (1):
x86/efi: Check status field to validate BGRT header
arch/x86/include/asm/efi.h | 2 ++ arch/x86/platform/efi/efi-bgrt.c | 2 +- arch/x86/platform/efi/efi.c | 5 ++--- arch/x86/platform/efi/efi_32.c | 6 ++++++ arch/x86/platform/efi/efi_64.c | 9 +++++++++ 5 files changed, 20 insertions(+), 4 deletions(-)
arch/x86/include/asm/efi.h +2 -0
@@ -132,6 +132,8 @@ extern void __init efi_map_region_fixed(efi_memory_desc_t *md);extern void efi_sync_low_kernel_mappings (void );extern void efi_setup_page_tables (void );extern void __init old_map_region (efi_memory_desc_t *md); +extern void __init runtime_code_page_mkexec (void ); +extern void __init efi_runtime_mkexec (void );struct efi_setup_data {u64 fw_vendor;
arch/x86/platform/efi/efi-bgrt.c +1 -1
@@ -42,7 +42,7 @@ void __init efi_bgrt_init(void)if (bgrt_tab->header.length <sizeof (*bgrt_tab))return ; -if (bgrt_tab->version !=1 ) +if (bgrt_tab->version !=1 || bgrt_tab->status !=1 )return ;if (bgrt_tab->image_type !=0 || !bgrt_tab->image_address)return ;
arch/x86/platform/efi/efi.c +2 -3
@@ -792,7 +792,7 @@ void __init efi_set_executable(efi_memory_desc_t *md, bool executable)set_memory_nx (addr, npages); } -static void __init runtime_code_page_mkexec (void ) +void __init runtime_code_page_mkexec (void ) {efi_memory_desc_t *md;void *p;
@@ -1069,8 +1069,7 @@ void __init efi_enter_virtual_mode(void) efi.update_capsule = virt_efi_update_capsule; efi.query_capsule_caps = virt_efi_query_capsule_caps; -if (efi_enabled (EFI_OLD_MEMMAP ) && (__supported_pte_mask & _PAGE_NX)) -runtime_code_page_mkexec (); +efi_runtime_mkexec ();kfree (new_memmap);
arch/x86/platform/efi/efi_32.c +6 -0
@@ -77,3 +77,9 @@ void efi_call_phys_epilog(void)local_irq_restore (efi_rt_eflags); } + +void __init efi_runtime_mkexec (void ) +{ +if (__supported_pte_mask & _PAGE_NX) +runtime_code_page_mkexec (); +}
arch/x86/platform/efi/efi_64.c +9 -0
@@ -233,3 +233,12 @@ void __init parse_efi_setup(u64 phys_addr, u32 data_len) { efi_setup = phys_addr +sizeof (struct setup_data ); } + +void __init efi_runtime_mkexec (void ) +{ +if (!efi_enabled (EFI_OLD_MEMMAP )) +return ; + +if (__supported_pte_mask & _PAGE_NX) +runtime_code_page_mkexec (); +}