summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2020-12-29 10:23:58 -0500
committerTom Rini <trini@konsulko.com>2020-12-29 10:23:58 -0500
commit21e1cae7902e6a9b1d7cf47cf4764e6fe7d3452a (patch)
treeda2c201eb28835141b1652216e57cb36811bd24d /include
parentab865a8ee5c1a069f72a171270c02c99ccda7bfa (diff)
parentbe48b0f453a3903e924a4f1790f134b9b36e5fa8 (diff)
downloadu-boot-21e1cae7902e6a9b1d7cf47cf4764e6fe7d3452a.tar.gz
u-boot-21e1cae7902e6a9b1d7cf47cf4764e6fe7d3452a.tar.xz
u-boot-21e1cae7902e6a9b1d7cf47cf4764e6fe7d3452a.zip
Merge tag 'efi-2021-01-rc5-2' of https://gitlab.denx.de/u-boot/custodians/u-boot-efi
Pull request for UEFI sub-system for efi-2021-01-rc5 (2) The following errors in the UEFI sub-system are fixed: * use after free in efi_exit() * invalid free when using the boot manager * pressing escape key once not recognized
Diffstat (limited to 'include')
-rw-r--r--include/efi_loader.h8
1 files changed, 5 insertions, 3 deletions
diff --git a/include/efi_loader.h b/include/efi_loader.h
index 3c68b85b68..0fc2255f3f 100644
--- a/include/efi_loader.h
+++ b/include/efi_loader.h
@@ -297,15 +297,17 @@ enum efi_image_auth_status {
* @exit_status: exit status passed to Exit()
* @exit_data_size: exit data size passed to Exit()
* @exit_data: exit data passed to Exit()
- * @exit_jmp: long jump buffer for returning form started image
+ * @exit_jmp: long jump buffer for returning from started image
* @entry: entry address of the relocated image
+ * @image_type: indicates if the image is an applicition or a driver
+ * @auth_status: indicates if the image is authenticated
*/
struct efi_loaded_image_obj {
struct efi_object header;
- efi_status_t exit_status;
+ efi_status_t *exit_status;
efi_uintn_t *exit_data_size;
u16 **exit_data;
- struct jmp_buf_data exit_jmp;
+ struct jmp_buf_data *exit_jmp;
EFIAPI efi_status_t (*entry)(efi_handle_t image_handle,
struct efi_system_table *st);
u16 image_type;