From: Alexander Graf Date: Thu, 25 Jan 2018 23:47:53 +0000 (+0100) Subject: efi_loader: Call Exit() on return from payload in StartImage() X-Git-Tag: v2018.03-rc1~11^2~4 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=56672bf52ebf7b9d6de245f7a1bf56679a39093b;p=oweals%2Fu-boot.git efi_loader: Call Exit() on return from payload in StartImage() When a UEFI payload just returns instead of calling the Exit() callback, we handle that in efi_do_enter() and call Exit on its behalf, so that the loaded_image->exit_status value is correct. We were missing that logic in StartImage(). Call it there too. Reported-by: Heinrich Schuchardt Signed-off-by: Alexander Graf --- diff --git a/lib/efi_loader/efi_boottime.c b/lib/efi_loader/efi_boottime.c index f5dae40f06..4a36b62828 100644 --- a/lib/efi_loader/efi_boottime.c +++ b/lib/efi_loader/efi_boottime.c @@ -1578,8 +1578,13 @@ static efi_status_t EFIAPI efi_start_image(efi_handle_t image_handle, ret = EFI_CALL(entry(image_handle, &systab)); - /* Should usually never get here */ - return EFI_EXIT(ret); + /* + * Usually UEFI applications call Exit() instead of returning. + * But because the world doesn not consist of ponies and unicorns, + * we're happy to emulate that behavior on behalf of a payload + * that forgot. + */ + return EFI_CALL(systab.boottime->exit(image_handle, ret, 0, NULL)); } /*