efi_loader: description of efi_add_handle()

[oweals/u-boot.git] / lib / efi_loader / efi_image_loader.c

diff --git a/lib/efi_loader/efi_image_loader.c b/lib/efi_loader/efi_image_loader.c
index cec17eabaa353c3fef96d5f8b524638dd94ff458..f8092b62026f9dc7a6cb03582545f3f316daa887 100644 (file)
--- a/lib/efi_loader/efi_image_loader.c
+++ b/lib/efi_loader/efi_image_loader.c
@@ -12,8 +12,10 @@
 #include <pe.h>
 
 const efi_guid_t efi_global_variable_guid = EFI_GLOBAL_VARIABLE_GUID;
-const efi_guid_t efi_guid_device_path = DEVICE_PATH_GUID;
-const efi_guid_t efi_guid_loaded_image = LOADED_IMAGE_GUID;
+const efi_guid_t efi_guid_device_path = EFI_DEVICE_PATH_PROTOCOL_GUID;
+const efi_guid_t efi_guid_loaded_image = EFI_LOADED_IMAGE_PROTOCOL_GUID;
+const efi_guid_t efi_guid_loaded_image_device_path =
+               EFI_LOADED_IMAGE_DEVICE_PATH_PROTOCOL_GUID;
 const efi_guid_t efi_simple_file_system_protocol_guid =
                EFI_SIMPLE_FILE_SYSTEM_PROTOCOL_GUID;
 const efi_guid_t efi_file_info_guid = EFI_FILE_INFO_GUID;
@@ -59,10 +61,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");
@@ -111,7 +113,7 @@ static efi_status_t efi_loader_relocate(const IMAGE_BASE_RELOCATION *rel,
                return EFI_SUCCESS;
 
        end = (const IMAGE_BASE_RELOCATION *)((const char *)rel + rel_size);
-       while (rel < end - 1 && rel->SizeOfBlock) {
+       while (rel < end && rel->SizeOfBlock) {
                const uint16_t *relocs = (const uint16_t *)(rel + 1);
                i = (rel->SizeOfBlock - sizeof(*rel)) / sizeof(uint16_t);
                while (i--) {
@@ -227,7 +229,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 +272,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 +287,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 +305,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 +334,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;
 }