Commit b2a18c25 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 Ingo Molnar:
 "Various fixes all over the map: prevent boot crashes on HyperV,
  classify UEFI randomness as bootloader randomness, fix EFI boot for
  the Raspberry Pi2, fix efi_test permissions, etc"

* 'efi-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  efi/efi_test: Lock down /dev/efi_test and require CAP_SYS_ADMIN
  x86, efi: Never relocate kernel below lowest acceptable address
  efi: libstub/arm: Account for firmware reserved memory at the base of RAM
  efi/random: Treat EFI_RNG_PROTOCOL output as bootloader randomness
  efi/tpm: Return -EINVAL when determining tpm final events log size fails
  efi: Make CONFIG_EFI_RCI2_TABLE selectable on x86 only
parents d540c398 359efcc2

arch/x86/boot/compressed/eboot.c

+3 −1
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ 
#include <asm/e820/types.h>

#include <asm/setup.h>

#include <asm/desc.h>

#include <asm/boot.h>



#include "../string.h"

#include "eboot.h"
@@ -813,7 +814,8 @@ efi_main(struct efi_config *c, struct boot_params *boot_params) 
		status = efi_relocate_kernel(sys_table, &bzimage_addr,

					     hdr->init_size, hdr->init_size,

					     hdr->pref_address,

					     hdr->kernel_alignment);

					     hdr->kernel_alignment,

					     LOAD_PHYSICAL_ADDR);

		if (status != EFI_SUCCESS) {

			efi_printk(sys_table, "efi_relocate_kernel() failed!\n");

			goto fail;

drivers/firmware/efi/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -182,6 +182,7 @@ config RESET_ATTACK_MITIGATION 


config EFI_RCI2_TABLE

	bool "EFI Runtime Configuration Interface Table Version 2 Support"

	depends on X86 || COMPILE_TEST

	help

	  Displays the content of the Runtime Configuration Interface

	  Table version 2 on Dell EMC PowerEdge systems as a binary

drivers/firmware/efi/efi.c

+1 −1
Original line number Diff line number Diff line
@@ -554,7 +554,7 @@ int __init efi_config_parse_tables(void *config_tables, int count, int sz, 
					      sizeof(*seed) + size);

			if (seed != NULL) {

				pr_notice("seeding entropy pool\n");

				add_device_randomness(seed->bits, seed->size);

				add_bootloader_randomness(seed->bits, seed->size);

				early_memunmap(seed, sizeof(*seed) + size);

			} else {

				pr_err("Could not map UEFI random seed!\n");

drivers/firmware/efi/libstub/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -52,6 +52,7 @@ lib-$(CONFIG_EFI_ARMSTUB) += arm-stub.o fdt.o string.o random.o \ 


lib-$(CONFIG_ARM)		+= arm32-stub.o

lib-$(CONFIG_ARM64)		+= arm64-stub.o

CFLAGS_arm32-stub.o		:= -DTEXT_OFFSET=$(TEXT_OFFSET)

CFLAGS_arm64-stub.o		:= -DTEXT_OFFSET=$(TEXT_OFFSET)



#

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

+13 −3
Original line number Diff line number Diff line
@@ -195,6 +195,7 @@ efi_status_t handle_kernel_image(efi_system_table_t *sys_table, 
				 unsigned long dram_base,

				 efi_loaded_image_t *image)

{

	unsigned long kernel_base;

	efi_status_t status;



	/*
@@ -204,9 +205,18 @@ efi_status_t handle_kernel_image(efi_system_table_t *sys_table, 
	 * loaded. These assumptions are made by the decompressor,

	 * before any memory map is available.

	 */

	dram_base = round_up(dram_base, SZ_128M);

	kernel_base = round_up(dram_base, SZ_128M);



	status = reserve_kernel_base(sys_table, dram_base, reserve_addr,

	/*

	 * Note that some platforms (notably, the Raspberry Pi 2) put

	 * spin-tables and other pieces of firmware at the base of RAM,

	 * abusing the fact that the window of TEXT_OFFSET bytes at the

	 * base of the kernel image is only partially used at the moment.

	 * (Up to 5 pages are used for the swapper page tables)

	 */

	kernel_base += TEXT_OFFSET - 5 * PAGE_SIZE;



	status = reserve_kernel_base(sys_table, kernel_base, reserve_addr,

				     reserve_size);

	if (status != EFI_SUCCESS) {

		pr_efi_err(sys_table, "Unable to allocate memory for uncompressed kernel.\n");
@@ -220,7 +230,7 @@ efi_status_t handle_kernel_image(efi_system_table_t *sys_table, 
	*image_size = image->image_size;

	status = efi_relocate_kernel(sys_table, image_addr, *image_size,

				     *image_size,

				     dram_base + MAX_UNCOMP_KERNEL_SIZE, 0);

				     kernel_base + MAX_UNCOMP_KERNEL_SIZE, 0, 0);

	if (status != EFI_SUCCESS) {

		pr_efi_err(sys_table, "Failed to relocate kernel.\n");

		efi_free(sys_table, *reserve_size, *reserve_addr);