From: Heinrich Schuchardt Date: Fri, 25 Aug 2017 17:53:14 +0000 (+0200) Subject: efi_loader: call __efi_exit_check in efi_exit X-Git-Tag: v2017.11-rc1~4^2~42 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=da94073b42cad349879ae5741e0b0fb3ac59a067;p=oweals%2Fu-boot.git efi_loader: call __efi_exit_check in efi_exit The calls to __efi_entry_check and __efi_exit_check have to match. If DEBUG is defined, panic() will be called otherwise. If debugging is activated some Travis CI builds fail due to an assertion in EFI_CALL without the patch. Signed-off-by: Heinrich Schuchardt Reviewed-by: Rob Clark Signed-off-by: Alexander Graf --- diff --git a/lib/efi_loader/efi_boottime.c b/lib/efi_loader/efi_boottime.c index 43f32385fa..ea953dca82 100644 --- a/lib/efi_loader/efi_boottime.c +++ b/lib/efi_loader/efi_boottime.c @@ -793,6 +793,8 @@ static efi_status_t EFIAPI efi_exit(efi_handle_t image_handle, EFI_ENTRY("%p, %ld, %ld, %p", image_handle, exit_status, exit_data_size, exit_data); + __efi_exit_check(); + loaded_image_info->exit_status = exit_status; longjmp(&loaded_image_info->exit_jmp, 1);