Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 056ad121 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'efi-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull EFI fixes from Thomas Gleixner:

 - Use explicitely sized type for the romimage pointer in the 32bit EFI
   protocol struct so a 64bit kernel does not expand it to 64bit. Ditto
   for the 64bit struct to avoid the reverse issue on 32bit kernels.

 - Handle randomized tex offset correctly in the ARM64 EFI stub to avoid
   unaligned data resulting in stack corruption and other hard to
   diagnose wreckage.

* 'efi-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  efi/libstub/arm64: Handle randomized TEXT_OFFSET
  efi: Avoid potential crashes, fix the 'struct efi_pci_io_protocol_32' definition for mixed mode
parents 583dbad3 4f74d72a

arch/x86/boot/compressed/eboot.c

+4 −2
Original line number Diff line number Diff line
@@ -163,7 +163,8 @@ __setup_efi_pci32(efi_pci_io_protocol_32 *pci, struct pci_setup_rom **__rom) 
	if (status != EFI_SUCCESS)

		goto free_struct;



	memcpy(rom->romdata, pci->romimage, pci->romsize);

	memcpy(rom->romdata, (void *)(unsigned long)pci->romimage,

	       pci->romsize);

	return status;



free_struct:
@@ -269,7 +270,8 @@ __setup_efi_pci64(efi_pci_io_protocol_64 *pci, struct pci_setup_rom **__rom) 
	if (status != EFI_SUCCESS)

		goto free_struct;



	memcpy(rom->romdata, pci->romimage, pci->romsize);

	memcpy(rom->romdata, (void *)(unsigned long)pci->romimage,

	       pci->romsize);

	return status;



free_struct:

drivers/firmware/efi/libstub/arm64-stub.c

+10 −0
Original line number Diff line number Diff line
@@ -97,6 +97,16 @@ efi_status_t handle_kernel_image(efi_system_table_t *sys_table_arg, 
		u32 offset = !IS_ENABLED(CONFIG_DEBUG_ALIGN_RODATA) ?

			     (phys_seed >> 32) & mask : TEXT_OFFSET;



		/*

		 * With CONFIG_RANDOMIZE_TEXT_OFFSET=y, TEXT_OFFSET may not

		 * be a multiple of EFI_KIMG_ALIGN, and we must ensure that

		 * we preserve the misalignment of 'offset' relative to

		 * EFI_KIMG_ALIGN so that statically allocated objects whose

		 * alignment exceeds PAGE_SIZE appear correctly aligned in

		 * memory.

		 */

		offset |= TEXT_OFFSET % EFI_KIMG_ALIGN;



		/*

		 * If KASLR is enabled, and we have some randomness available,

		 * locate the kernel at a randomized offset in physical memory.

include/linux/efi.h

+4 −4
Original line number Diff line number Diff line
@@ -395,8 +395,8 @@ typedef struct { 
	u32 attributes;

	u32 get_bar_attributes;

	u32 set_bar_attributes;

	uint64_t romsize;

	void *romimage;

	u64 romsize;

	u32 romimage;

} efi_pci_io_protocol_32;



typedef struct {
@@ -415,8 +415,8 @@ typedef struct { 
	u64 attributes;

	u64 get_bar_attributes;

	u64 set_bar_attributes;

	uint64_t romsize;

	void *romimage;

	u64 romsize;

	u64 romimage;

} efi_pci_io_protocol_64;



typedef struct {