]> git.dujemihanovic.xyz Git - u-boot.git/commitdiff
efi_loader: call __efi_exit_check in efi_exit
authorHeinrich Schuchardt <xypron.glpk@gmx.de>
Fri, 25 Aug 2017 17:53:14 +0000 (19:53 +0200)
committerAlexander Graf <agraf@suse.de>
Mon, 18 Sep 2017 21:53:56 +0000 (23:53 +0200)
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 <xypron.glpk@gmx.de>
Reviewed-by: Rob Clark <robdclark@gmail.com>
Signed-off-by: Alexander Graf <agraf@suse.de>
lib/efi_loader/efi_boottime.c

index 43f32385fae01fbdbbcfdbae2e9c4d78e7918477..ea953dca82d599782aa9b16312a2948c92a80913 100644 (file)
@@ -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);