Currently, image's image_base points to an address where the image was temporarily uploaded for further loading. Since efi_loader relocates the image to final destination, image_base and image_size should reflect that.

This bug was detected in UEFI SCT, "Loaded Image Protocol Test - test 2," which shows that 'Unload' function doesn't fit into a range suggested by image_base and image_size. TestCase/UEFI/EFI/Protocol/LoadedImage/BlackBoxTest/ LoadedImageBBTestMain.c:1002

This patch also reverts a patch, "efi_loader: save image relocation address and size" since newly added fields are no longer needed.

Signed-off-by: AKASHI Takahiro takahiro.akashi@linaro.org --- include/efi_api.h | 2 -- lib/efi_loader/efi_image_loader.c | 17 ++++++----------- 2 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/include/efi_api.h b/include/efi_api.h index b2806fba3b8..882a734c198 100644 --- a/include/efi_api.h +++ b/include/efi_api.h @@ -345,8 +345,6 @@ struct efi_loaded_image {

/* Below are efi loader private fields */ #ifdef CONFIG_EFI_LOADER - void *reloc_base; - aligned_u64 reloc_size; efi_status_t exit_status; struct jmp_buf_data exit_jmp; #endif diff --git a/lib/efi_loader/efi_image_loader.c b/lib/efi_loader/efi_image_loader.c index fdf40a62c8e..df244deeac5 100644 --- a/lib/efi_loader/efi_image_loader.c +++ b/lib/efi_loader/efi_image_loader.c @@ -58,10 +58,10 @@ efi_status_t efi_print_image_info(struct efi_loaded_image *image, void *pc) return EFI_INVALID_PARAMETER; printf("UEFI image"); printf(" [0x%p:0x%p]", - image->reloc_base, image->reloc_base + image->reloc_size - 1); - if (pc && pc >= image->reloc_base && - pc < image->reloc_base + image->reloc_size) - printf(" pc=0x%zx", pc - image->reloc_base); + image->image_base, image->image_base + image->image_size - 1); + if (pc && pc >= image->image_base && + pc < image->image_base + image->image_size) + printf(" pc=0x%zx", pc - image->image_base); if (image->file_path) printf(" '%pD'", image->file_path); printf("\n"); @@ -209,7 +209,6 @@ void *efi_load_pe(void *efi, struct efi_loaded_image *loaded_image_info) int rel_idx = IMAGE_DIRECTORY_ENTRY_BASERELOC; void *entry; uint64_t image_base; - uint64_t image_size; unsigned long virt_size = 0; int supported = 0;

@@ -253,7 +252,6 @@ void *efi_load_pe(void *efi, struct efi_loaded_image *loaded_image_info) IMAGE_NT_HEADERS64 *nt64 = (void *)nt; IMAGE_OPTIONAL_HEADER64 *opt = &nt64->OptionalHeader; image_base = opt->ImageBase; - image_size = opt->SizeOfImage; efi_set_code_and_data_type(loaded_image_info, opt->Subsystem); efi_reloc = efi_alloc(virt_size, loaded_image_info->image_code_type); @@ -269,7 +267,6 @@ void *efi_load_pe(void *efi, struct efi_loaded_image *loaded_image_info) } else if (nt->OptionalHeader.Magic == IMAGE_NT_OPTIONAL_HDR32_MAGIC) { IMAGE_OPTIONAL_HEADER32 *opt = &nt->OptionalHeader; image_base = opt->ImageBase; - image_size = opt->SizeOfImage; efi_set_code_and_data_type(loaded_image_info, opt->Subsystem); efi_reloc = efi_alloc(virt_size, loaded_image_info->image_code_type); @@ -312,10 +309,8 @@ void *efi_load_pe(void *efi, struct efi_loaded_image *loaded_image_info) invalidate_icache_all();

/* Populate the loaded image interface bits */ - loaded_image_info->image_base = efi; - loaded_image_info->image_size = image_size; - loaded_image_info->reloc_base = efi_reloc; - loaded_image_info->reloc_size = virt_size; + loaded_image_info->image_base = efi_reloc; + loaded_image_info->image_size = virt_size;

return entry; }