efi_loader: set image_base and image_size to correct values

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

Changes in this patch also includes:
* reverts a patch, "efi_loader: save image relocation address
  and size" since newly added fields are no longer needed.
* copy PE headers as well since those information will be needed
  for module loading, in particular, at gurb.
  (This bug was reported by Heinrich.)

Reported-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
Signed-off-by: AKASHI Takahiro <takahiro.akashi@linaro.org>
Rebase patch.
Remove unused fields from struct efi_loaded_image_obj.

Reviewed-by: Heinrich Schuchardt <xypron.glpk@gmx.de>

diff --git a/include/efi_loader.h b/include/efi_loader.h
index 512880ab8fbf3df9dca2f3b030a1461cc020ee31..9f776021ab18b5e9eae23f1204641d35b4c1c4ce 100644 (file)
--- a/include/efi_loader.h
+++ b/include/efi_loader.h
@@ -203,15 +203,11 @@ struct efi_object {
  * struct efi_loaded_image_obj - handle of a loaded image
  *
  * @header:            EFI object header
- * @reloc_base:                base address for the relocated image
- * @reloc_size:                size of the relocated image
  * @exit_jmp:          long jump buffer for returning form started image
  * @entry:             entry address of the relocated image
  */
 struct efi_loaded_image_obj {
        struct efi_object header;
-       void *reloc_base;
-       aligned_u64 reloc_size;
        efi_status_t exit_status;
        struct jmp_buf_data exit_jmp;
        EFIAPI efi_status_t (*entry)(efi_handle_t image_handle,

diff --git a/lib/efi_loader/efi_image_loader.c b/lib/efi_loader/efi_image_loader.c
index fe66e7b9ffe1146a8bb27e28403649071c4bbd04..6101e6d0371fa1e864005d61ed4dd906031cf572 100644 (file)
--- a/lib/efi_loader/efi_image_loader.c
+++ b/lib/efi_loader/efi_image_loader.c
@@ -59,10 +59,10 @@ static efi_status_t efi_print_image_info(struct efi_loaded_image_obj *obj,
 {
        printf("UEFI image");
        printf(" [0x%p:0x%p]",
-              obj->reloc_base, obj->reloc_base + obj->reloc_size - 1);
-       if (pc && pc >= obj->reloc_base &&
-           pc < obj->reloc_base + obj->reloc_size)
-               printf(" pc=0x%zx", pc - obj->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");
@@ -227,7 +227,6 @@ efi_status_t efi_load_pe(struct efi_loaded_image_obj *handle, void *efi,
        unsigned long rel_size;
        int rel_idx = IMAGE_DIRECTORY_ENTRY_BASERELOC;
        uint64_t image_base;
-       uint64_t image_size;
        unsigned long virt_size = 0;
        int supported = 0;
 
@@ -271,7 +270,6 @@ efi_status_t efi_load_pe(struct efi_loaded_image_obj *handle, void *efi,
                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);
@@ -287,7 +285,6 @@ efi_status_t efi_load_pe(struct efi_loaded_image_obj *handle, void *efi,
        } 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);
@@ -306,6 +303,11 @@ efi_status_t efi_load_pe(struct efi_loaded_image_obj *handle, void *efi,
                return EFI_LOAD_ERROR;
        }
 
+       /* Copy PE headers */
+       memcpy(efi_reloc, efi, sizeof(*dos) + sizeof(*nt)
+              + nt->FileHeader.SizeOfOptionalHeader
+              + num_sections * sizeof(IMAGE_SECTION_HEADER));
+
        /* Load sections into RAM */
        for (i = num_sections - 1; i >= 0; i--) {
                IMAGE_SECTION_HEADER *sec = &sections[i];
@@ -330,10 +332,8 @@ efi_status_t efi_load_pe(struct efi_loaded_image_obj *handle, void *efi,
        invalidate_icache_all();
 
        /* Populate the loaded image interface bits */
-       loaded_image_info->image_base = efi;
-       loaded_image_info->image_size = image_size;
-       handle->reloc_base = efi_reloc;
-       handle->reloc_size = virt_size;
+       loaded_image_info->image_base = efi_reloc;
+       loaded_image_info->image_size = virt_size;
 
        return EFI_SUCCESS;
 }