efi_loader: bootbin: do not load an initrd if none is provided

Do not try to create an initrd device path nor try to register
an initrd with the EFI_LOAD_FILE2_PROTOCOL if none is provided.

Handle initrd installation in efi_binary_run_dp with
efi_install_initrd, imitating what is done for the fdt.

Fixes: 36835a9105c ("efi_loader: binary_run: register an initrd")
Reported-by: Weizhao Ouyang <o451686892@gmail.com>
Signed-off-by: Adriano Cordova <adriano.cordova@canonical.com>
Tested-by: Weizhao Ouyang <o451686892@gmail.com>
Reviewed-by: Ilias Apalodimas <ilias.apalodimas@linaro.org>
Reviewed-by: Heinrich Schuchardt <xypron.glpk@gmx.de>

diff --git a/include/efi_loader.h b/include/efi_loader.h
index 144b749278a8d460c261eadab518d0e8bb8b5ab8..84e8cfe320e2b83932f177d1f0e3b7481120cec7 100644 (file)
--- a/include/efi_loader.h
+++ b/include/efi_loader.h
@@ -597,6 +597,8 @@ efi_status_t efi_env_set_load_options(efi_handle_t handle, const char *env_var,
 void *efi_get_configuration_table(const efi_guid_t *guid);
 /* Install device tree */
 efi_status_t efi_install_fdt(void *fdt);
+/* Install initrd */
+efi_status_t efi_install_initrd(void *initrd, size_t initd_sz);
 /* Execute loaded UEFI image */
 efi_status_t do_bootefi_exec(efi_handle_t handle, void *load_options);
 /* Run loaded UEFI image with given fdt */

diff --git a/lib/efi_loader/efi_bootbin.c b/lib/efi_loader/efi_bootbin.c
index d0f7da309ce74e74cf30c4d6bef99406fa3e3f0f..6a189c31ffa29ef7186a830354ee3d08ecb937de 100644 (file)
--- a/lib/efi_loader/efi_bootbin.c
+++ b/lib/efi_loader/efi_bootbin.c
@@ -220,7 +220,6 @@ static efi_status_t efi_binary_run_dp(void *image, size_t size, void *fdt,
                                      struct efi_device_path *dp_img)
 {
        efi_status_t ret;
-       struct efi_device_path *dp_initrd;
 
        /* Initialize EFI drivers */
        ret = efi_init_obj_list();
@@ -234,11 +233,7 @@ static efi_status_t efi_binary_run_dp(void *image, size_t size, void *fdt,
        if (ret != EFI_SUCCESS)
                return ret;
 
-       dp_initrd = efi_dp_from_mem(EFI_LOADER_DATA, (uintptr_t)initrd, initd_sz);
-       if (!dp_initrd)
-               return EFI_OUT_OF_RESOURCES;
-
-       ret = efi_initrd_register(dp_initrd);
+       ret = efi_install_initrd(initrd, initd_sz);
        if (ret != EFI_SUCCESS)
                return ret;
 

diff --git a/lib/efi_loader/efi_helper.c b/lib/efi_loader/efi_helper.c
index 3936139ca41c459553ab4906e554872a7b747611..19fb5d03fec85396d8975b39864de76eeea6f692 100644 (file)
--- a/lib/efi_loader/efi_helper.c
+++ b/lib/efi_loader/efi_helper.c
@@ -622,6 +622,35 @@ efi_status_t efi_install_fdt(void *fdt)
        return EFI_SUCCESS;
 }
 
+/**
+ * efi_install_initrd() - install initrd
+ *
+ * Install the initrd located at @initrd using the EFI_LOAD_FILE2
+ * protocol.
+ *
+ * @initrd:    address of initrd or NULL if none is provided
+ * @initrd_sz: size of initrd
+ * Return:     status code
+ */
+efi_status_t efi_install_initrd(void *initrd, size_t initd_sz)
+{
+       efi_status_t ret;
+       struct efi_device_path *dp_initrd;
+
+       if (!initrd)
+               return EFI_SUCCESS;
+
+       dp_initrd = efi_dp_from_mem(EFI_LOADER_DATA, (uintptr_t)initrd, initd_sz);
+       if (!dp_initrd)
+               return EFI_OUT_OF_RESOURCES;
+
+       ret = efi_initrd_register(dp_initrd);
+       if (ret != EFI_SUCCESS)
+               efi_free_pool(dp_initrd);
+
+       return ret;
+}
+
 /**
  * do_bootefi_exec() - execute EFI binary
  *