leandrof/u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

efi_loader: check map_key in ExitBootServices

Browse Source 
The UEFI spec requires that the memory map key is checked in
ExitBootServices().

Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
Signed-off-by: Alexander Graf <agraf@suse.de>
This commit is contained in:
Heinrich Schuchardt 2018-07-02 12:53:55 +02:00 committed by Alexander Graf
parent 8e835554b3
commit 1fcb7ea284
3 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/efi_loader.h
View File

@ -82,6 +82,9 @@ const char *__efi_nesting_dec(void);
#define EFI_CACHELINE_SIZE 128
#endif
/* Key identifying current memory map */
extern efi_uintn_t efi_memory_map_key;
extern struct efi_runtime_services efi_runtime_services;
extern struct efi_system_table systab;

4
lib/efi_loader/efi_boottime.c
View File

@ -1854,6 +1854,10 @@ static efi_status_t EFIAPI efi_exit_boot_services(efi_handle_t image_handle,
EFI_ENTRY("%p, %ld", image_handle, map_key);
/* Check that the caller has read the current memory map */
if (map_key != efi_memory_map_key)
return EFI_INVALID_PARAMETER;
/* Make sure that notification functions are not called anymore */
efi_tpl = TPL_HIGH_LEVEL;

8
lib/efi_loader/efi_memory.c
View File

@ -15,6 +15,8 @@
DECLARE_GLOBAL_DATA_PTR;
efi_uintn_t efi_memory_map_key;
struct efi_mem_list {
struct list_head link;
struct efi_mem_desc desc;
@ -160,9 +162,13 @@ uint64_t efi_add_memory_map(uint64_t start, uint64_t pages, int memory_type,
debug("%s: 0x%" PRIx64 " 0x%" PRIx64 " %d %s\n", __func__,
start, pages, memory_type, overlap_only_ram ? "yes" : "no");
if (memory_type >= EFI_MAX_MEMORY_TYPE)
return EFI_INVALID_PARAMETER;
if (!pages)
return start;
++efi_memory_map_key;
newlist = calloc(1, sizeof(*newlist));
newlist->desc.type = memory_type;
newlist->desc.physical_start = start;
@ -487,7 +493,7 @@ efi_status_t efi_get_memory_map(efi_uintn_t *memory_map_size,
}
if (map_key)
*map_key = 0;
*map_key = efi_memory_map_key;
return EFI_SUCCESS;
}