|
@@ -898,6 +898,7 @@ efi_status_t efi_load_pe(struct efi_loaded_image_obj *handle,
|
|
|
image_base = opt->ImageBase;
|
|
|
efi_set_code_and_data_type(loaded_image_info, opt->Subsystem);
|
|
|
handle->image_type = opt->Subsystem;
|
|
|
+ virt_size = ALIGN(virt_size, opt->SectionAlignment);
|
|
|
efi_reloc = efi_alloc(virt_size,
|
|
|
loaded_image_info->image_code_type);
|
|
|
if (!efi_reloc) {
|
|
@@ -908,12 +909,12 @@ efi_status_t efi_load_pe(struct efi_loaded_image_obj *handle,
|
|
|
handle->entry = efi_reloc + opt->AddressOfEntryPoint;
|
|
|
rel_size = opt->DataDirectory[rel_idx].Size;
|
|
|
rel = efi_reloc + opt->DataDirectory[rel_idx].VirtualAddress;
|
|
|
- virt_size = ALIGN(virt_size, opt->SectionAlignment);
|
|
|
} else if (nt->OptionalHeader.Magic == IMAGE_NT_OPTIONAL_HDR32_MAGIC) {
|
|
|
IMAGE_OPTIONAL_HEADER32 *opt = &nt->OptionalHeader;
|
|
|
image_base = opt->ImageBase;
|
|
|
efi_set_code_and_data_type(loaded_image_info, opt->Subsystem);
|
|
|
handle->image_type = opt->Subsystem;
|
|
|
+ virt_size = ALIGN(virt_size, opt->SectionAlignment);
|
|
|
efi_reloc = efi_alloc(virt_size,
|
|
|
loaded_image_info->image_code_type);
|
|
|
if (!efi_reloc) {
|
|
@@ -924,7 +925,6 @@ efi_status_t efi_load_pe(struct efi_loaded_image_obj *handle,
|
|
|
handle->entry = efi_reloc + opt->AddressOfEntryPoint;
|
|
|
rel_size = opt->DataDirectory[rel_idx].Size;
|
|
|
rel = efi_reloc + opt->DataDirectory[rel_idx].VirtualAddress;
|
|
|
- virt_size = ALIGN(virt_size, opt->SectionAlignment);
|
|
|
} else {
|
|
|
log_err("Invalid optional header magic %x\n",
|
|
|
nt->OptionalHeader.Magic);
|