dany/u-boot-megous
1
0
Fork 0
mirror of https://xff.cz/git/u-boot/ synced 2025-09-20 01:52:09 +02:00
Code Issues Packages Projects Releases Wiki Activity

efi_loader: AllocatePages() must accept addr == 0

Browse Source 
It must be possible to allocate memory at address 0 with AllocatePages().

Move a NULL pointer check.

Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
This commit is contained in:
Heinrich Schuchardt
2019-06-12 07:17:04 +02:00
parent 98967379b6
commit 0e22c7cbeb
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/efi_loader/efi_memory.c
View File

@@ -334,7 +334,6 @@ uint64_t efi_add_memory_map(uint64_t start, uint64_t pages, int memory_type,
* *
* Check that the address is within allocated memory: * Check that the address is within allocated memory:
* *
* * The address cannot be NULL.
* * The address must be in a range of the memory map. * * The address must be in a range of the memory map.
* * The address may not point to EFI_CONVENTIONAL_MEMORY. * * The address may not point to EFI_CONVENTIONAL_MEMORY.
* *
@@ -349,8 +348,6 @@ static efi_status_t efi_check_allocated(u64 addr, bool must_be_allocated)
{ {
struct efi_mem_list *item; struct efi_mem_list *item;
if (!addr)
return EFI_INVALID_PARAMETER;
list_for_each_entry(item, &efi_mem, link) { list_for_each_entry(item, &efi_mem, link) {
u64 start = item->desc.physical_start; u64 start = item->desc.physical_start;
u64 end = start + (item->desc.num_pages << EFI_PAGE_SHIFT); u64 end = start + (item->desc.num_pages << EFI_PAGE_SHIFT);
@@ -560,6 +557,9 @@ efi_status_t efi_free_pool(void *buffer)
efi_status_t ret; efi_status_t ret;
struct efi_pool_allocation *alloc; struct efi_pool_allocation *alloc;
if (!buffer)
return EFI_INVALID_PARAMETER;
ret = efi_check_allocated((uintptr_t)buffer, true); ret = efi_check_allocated((uintptr_t)buffer, true);
if (ret != EFI_SUCCESS) if (ret != EFI_SUCCESS)
return ret; return ret;