diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/efi_loader/efi_boottime.c | 13 | ||||
| -rw-r--r-- | lib/efi_loader/efi_debug_support.c | 2 | ||||
| -rw-r--r-- | lib/efi_loader/efi_net.c | 6 | ||||
| -rw-r--r-- | lib/efi_loader/efi_var_file.c | 2 |
4 files changed, 13 insertions, 10 deletions
diff --git a/lib/efi_loader/efi_boottime.c b/lib/efi_loader/efi_boottime.c index ddc935d2240..b424d924896 100644 --- a/lib/efi_loader/efi_boottime.c +++ b/lib/efi_loader/efi_boottime.c @@ -3494,12 +3494,6 @@ static efi_status_t EFIAPI efi_exit(efi_handle_t image_handle, if (ret != EFI_SUCCESS) EFI_PRINT("%s: out of memory\n", __func__); } - /* efi_delete_image() frees image_obj. Copy before the call. */ - exit_jmp = image_obj->exit_jmp; - *image_obj->exit_status = exit_status; - if (image_obj->image_type == IMAGE_SUBSYSTEM_EFI_APPLICATION || - exit_status != EFI_SUCCESS) - efi_delete_image(image_obj, loaded_image_protocol); if (IS_ENABLED(CONFIG_EFI_TCG2_PROTOCOL)) { if (image_obj->image_type == IMAGE_SUBSYSTEM_EFI_APPLICATION) { @@ -3510,6 +3504,13 @@ static efi_status_t EFIAPI efi_exit(efi_handle_t image_handle, } } + /* efi_delete_image() frees image_obj. Copy before the call. */ + exit_jmp = image_obj->exit_jmp; + *image_obj->exit_status = exit_status; + if (image_obj->image_type == IMAGE_SUBSYSTEM_EFI_APPLICATION || + exit_status != EFI_SUCCESS) + efi_delete_image(image_obj, loaded_image_protocol); + /* Make sure entry/exit counts for EFI world cross-overs match */ EFI_EXIT(exit_status); diff --git a/lib/efi_loader/efi_debug_support.c b/lib/efi_loader/efi_debug_support.c index 490b0bb7088..8d0c133871e 100644 --- a/lib/efi_loader/efi_debug_support.c +++ b/lib/efi_loader/efi_debug_support.c @@ -111,7 +111,7 @@ efi_status_t efi_core_new_debug_image_info_entry(u32 image_info_type, /* Allocate data for new entry. */ ret = efi_allocate_pool(EFI_BOOT_SERVICES_DATA, - sizeof(union efi_debug_image_info), + sizeof(struct efi_debug_image_info_normal), (void **)(&(*table)[index].normal_image)); if (ret == EFI_SUCCESS && (*table)[index].normal_image) { /* Update the entry. */ diff --git a/lib/efi_loader/efi_net.c b/lib/efi_loader/efi_net.c index 0f8a851e3f2..c2b85dac236 100644 --- a/lib/efi_loader/efi_net.c +++ b/lib/efi_loader/efi_net.c @@ -1024,8 +1024,10 @@ efi_status_t efi_netobj_set_dp(struct efi_net_obj *netobj, struct efi_device_pat goto add; // If it is already installed, try to update it - ret = efi_reinstall_protocol_interface(&netobj->header, &efi_guid_device_path, - phandler->protocol_interface, new_net_dp); + ret = EFI_CALL(efi_reinstall_protocol_interface(&netobj->header, + &efi_guid_device_path, + phandler->protocol_interface, + new_net_dp)); if (ret != EFI_SUCCESS) return ret; diff --git a/lib/efi_loader/efi_var_file.c b/lib/efi_loader/efi_var_file.c index ba0bf33ffbd..f23a964a418 100644 --- a/lib/efi_loader/efi_var_file.c +++ b/lib/efi_loader/efi_var_file.c @@ -173,7 +173,7 @@ efi_status_t efi_var_from_file(void) r = fs_read(EFI_VAR_FILE_NAME, map_to_sysmem(buf), 0, EFI_VAR_BUF_SIZE, &len); if (r || len < sizeof(struct efi_var_file)) { - log_err("Failed to load EFI variables\n"); + log_info("No EFI variables loaded\n"); goto error; } if (buf->length != len || efi_var_restore(buf, false) != EFI_SUCCESS) |