x86/efistub: Avoid returning EFI_SUCCESS on error

The fail label is only used in a situation where the previous EFI API
call succeeded, and so status will be set to EFI_SUCCESS. Fix this, by
dropping the goto entirely, and call efi_exit() with the correct error
code.

Signed-off-by: Ard Biesheuvel <ardb@kernel.org>

diff --git a/drivers/firmware/efi/libstub/x86-stub.c b/drivers/firmware/efi/libstub/x86-stub.c
index 51b7185f8707ff980909464f8387f2046e2abb9f..a4d0164ba35e193e05155fc5aae243418908f48a 100644 (file)
--- a/drivers/firmware/efi/libstub/x86-stub.c
+++ b/drivers/firmware/efi/libstub/x86-stub.c
@@ -566,16 +566,13 @@ efi_status_t __efiapi efi_pe_entry(efi_handle_t handle,
        /* Convert unicode cmdline to ascii */
        cmdline_ptr = efi_convert_cmdline(image, &options_size);
        if (!cmdline_ptr)
-               goto fail;
+               efi_exit(handle, EFI_OUT_OF_RESOURCES);
 
        efi_set_u64_split((unsigned long)cmdline_ptr, &hdr->cmd_line_ptr,
                          &boot_params.ext_cmd_line_ptr);
 
        efi_stub_entry(handle, sys_table_arg, &boot_params);
        /* not reached */
-
-fail:
-       efi_exit(handle, status);
 }
 
 static void add_e820ext(struct boot_params *params,