Re: [PATCH] efi_loader: do not install dtb if bootmgr fails

[Ilias Apalodimas]

On Mon, 22 Apr 2024 at 12:16, Heinrich Schuchardt
 wrote:
>
> If the UEFI boot manager fails, there is no point in installing the
> device-tree as a configuration table.
>
> Signed-off-by: Heinrich Schuchardt 
> ---
>  lib/efi_loader/efi_bootmgr.c | 8 
>  1 file changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/lib/efi_loader/efi_bootmgr.c b/lib/efi_loader/efi_bootmgr.c
> index c64cbe82402..2b0d3137338 100644
> --- a/lib/efi_loader/efi_bootmgr.c
> +++ b/lib/efi_loader/efi_bootmgr.c
> @@ -1209,15 +1209,15 @@ efi_status_t efi_bootmgr_run(void *fdt)
> return CMD_RET_FAILURE;
> }
>
> -   ret = efi_install_fdt(fdt);
> -   if (ret != EFI_SUCCESS)
> -   return ret;
> -
> ret = efi_bootmgr_load(, _options);
> if (ret != EFI_SUCCESS) {
> log_notice("EFI boot manager: Cannot load any image\n");
> return ret;
> }
>
> +   ret = efi_install_fdt(fdt);
> +   if (ret != EFI_SUCCESS)
> +   return ret;
> +
> return do_bootefi_exec(handle, load_options);
>  }
> --
> 2.43.0
>

Reviewed-by: Ilias Apalodimas 

[PATCH] efi_loader: do not install dtb if bootmgr fails

[Heinrich Schuchardt]

If the UEFI boot manager fails, there is no point in installing the
device-tree as a configuration table.

Signed-off-by: Heinrich Schuchardt 
---
 lib/efi_loader/efi_bootmgr.c | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/efi_loader/efi_bootmgr.c b/lib/efi_loader/efi_bootmgr.c
index c64cbe82402..2b0d3137338 100644
--- a/lib/efi_loader/efi_bootmgr.c
+++ b/lib/efi_loader/efi_bootmgr.c
@@ -1209,15 +1209,15 @@ efi_status_t efi_bootmgr_run(void *fdt)
return CMD_RET_FAILURE;
}
 
-   ret = efi_install_fdt(fdt);
-   if (ret != EFI_SUCCESS)
-   return ret;
-
ret = efi_bootmgr_load(, _options);
if (ret != EFI_SUCCESS) {
log_notice("EFI boot manager: Cannot load any image\n");
return ret;
}
 
+   ret = efi_install_fdt(fdt);
+   if (ret != EFI_SUCCESS)
+   return ret;
+
return do_bootefi_exec(handle, load_options);
 }
-- 
2.43.0