[PATCH v4] disk: efi_loader: Improve disk image detection in efi_bootmgr
Javier Tia
javier.tia at linaro.org
Wed Sep 3 23:44:16 CEST 2025
Enhances the process for identifying disk images within the EFI boot
manager. Utilize part_driver_lookup_type() to verify the validity of a
downloaded file as a disk image, rather than depending on file
extensions.
part_driver_lookup_type() is now used in the prepare_loaded_image()
function in the EFI boot manager to detect partitions on a block device
created from a downloaded image. This allows the boot manager to boot
from any disk image that can be recognized by a partition driver, not
just ISO and IMG images.
Update prepare_loaded_image() to create the ramdisk block device
internally, obtain the blk_desc and use part_driver_lookup_type() to
detect a valid partition table.
In try_load_from_uri_path(), try prepare_loaded_image() first to detect
disk images, and fall back to PE-COFF detection only if that fails.
Include part.h in the EFI loader and export part_driver_lookup_type and
add its prototype and documentation in include/part.h. This makes the
partition-driver lookup available to other code paths that need to
detect partition tables on a block descriptor.
Signed-off-by: Javier Tia <javier.tia at linaro.org>
---
disk/part.c | 2 +-
include/part.h | 18 ++++++++++
lib/efi_loader/efi_bootmgr.c | 64 +++++++++++++++++++++++++-----------
3 files changed, 63 insertions(+), 21 deletions(-)
diff --git a/disk/part.c b/disk/part.c
index 66e2b3a7219..f0c6866e210 100644
--- a/disk/part.c
+++ b/disk/part.c
@@ -63,7 +63,7 @@ static struct part_driver *part_driver_get_type(int part_type)
* @dev_desc: Device descriptor
* Return: Driver found, or NULL if none
*/
-static struct part_driver *part_driver_lookup_type(struct blk_desc *desc)
+struct part_driver *part_driver_lookup_type(struct blk_desc *desc)
{
struct part_driver *drv =
ll_entry_start(struct part_driver, part_driver);
diff --git a/include/part.h b/include/part.h
index b772fb34c8a..3fc3186f4c4 100644
--- a/include/part.h
+++ b/include/part.h
@@ -727,6 +727,24 @@ int part_get_type_by_name(const char *name);
*/
int part_get_bootable(struct blk_desc *desc);
+/**
+ * part_driver_lookup_type() - Look up the partition driver for a blk device
+ *
+ * If @desc->part_type is PART_TYPE_UNKNOWN, this checks each partition driver
+ * against the blk device to see if there is a valid partition table acceptable
+ * to that driver.
+ *
+ * If @desc->part_type is already set, it just returns the driver for that
+ * type, without testing if the driver can find a valid partition on the
+ * descriptor.
+ *
+ * On success it updates @desc->part_type if set to PART_TYPE_UNKNOWN on entry
+ *
+ * @desc: Device descriptor
+ * Return: Driver found, or NULL if none
+ */
+struct part_driver *part_driver_lookup_type(struct blk_desc *desc);
+
#else
static inline int part_driver_get_count(void)
{ return 0; }
diff --git a/lib/efi_loader/efi_bootmgr.c b/lib/efi_loader/efi_bootmgr.c
index 662993fb809..728e89bd95b 100644
--- a/lib/efi_loader/efi_bootmgr.c
+++ b/lib/efi_loader/efi_bootmgr.c
@@ -17,6 +17,7 @@
#include <log.h>
#include <malloc.h>
#include <net.h>
+#include <part.h>
#include <efi_loader.h>
#include <efi_variable.h>
#include <asm/unaligned.h>
@@ -347,6 +348,9 @@ static efi_status_t fill_default_file_path(struct udevice *blk,
* @dp: pointer to default file device path
* @blk: pointer to created blk udevice
* Return: status code
+ *
+ * This function handles device creation internally and performs cleanup
+ * on error paths.
*/
static efi_status_t prepare_loaded_image(u16 *label, ulong addr, ulong size,
struct efi_device_path **dp,
@@ -355,15 +359,36 @@ static efi_status_t prepare_loaded_image(u16 *label, ulong addr, ulong size,
u64 pages;
efi_status_t ret;
struct udevice *ramdisk_blk;
+ struct blk_desc *desc;
+ struct part_driver *part_drv;
+ /* Create the ramdisk block device internally */
ramdisk_blk = mount_image(label, addr, size);
- if (!ramdisk_blk)
- return EFI_LOAD_ERROR;
+ if (!ramdisk_blk) {
+ log_err("Failed to create ramdisk block device\n");
+ return EFI_DEVICE_ERROR;
+ }
+
+ /* Get the block descriptor and detect partitions */
+ desc = dev_get_uclass_plat(ramdisk_blk);
+ if (!desc) {
+ log_err("Failed to get block descriptor\n");
+ ret = EFI_DEVICE_ERROR;
+ goto err_cleanup_blkdev;
+ }
+
+ /* Use part_driver_lookup_type for comprehensive partition detection */
+ part_drv = part_driver_lookup_type(desc);
+ if (!part_drv) {
+ log_err("Image is not a valid disk image\n");
+ ret = EFI_INVALID_PARAMETER;
+ goto err_cleanup_blkdev;
+ }
ret = fill_default_file_path(ramdisk_blk, dp);
if (ret != EFI_SUCCESS) {
log_info("Cannot boot from downloaded image\n");
- goto err;
+ goto err_cleanup_blkdev;
}
/*
@@ -379,17 +404,17 @@ static efi_status_t prepare_loaded_image(u16 *label, ulong addr, ulong size,
false, true);
if (ret != EFI_SUCCESS) {
log_err("Failed to reserve memory\n");
- goto err;
+ goto err_cleanup_blkdev;
}
*blk = ramdisk_blk;
return EFI_SUCCESS;
-err:
+err_cleanup_blkdev:
+ /* Clean up the created block device on error */
if (blkmap_destroy(ramdisk_blk->parent))
- log_err("Destroying blkmap failed\n");
-
+ log_err("Destroying blkmap failed during cleanup\n");
return ret;
}
@@ -407,7 +432,7 @@ static efi_status_t efi_bootmgr_release_uridp(struct uridp_context *ctx)
if (!ctx)
return ret;
- /* cleanup for iso or img image */
+ /* cleanup for disk image */
if (ctx->ramdisk_blk_dev) {
ret = efi_add_memory_map(ctx->image_addr, ctx->image_size,
EFI_CONVENTIONAL_MEMORY);
@@ -452,6 +477,7 @@ static void EFIAPI efi_bootmgr_http_return(struct efi_event *event,
EFI_EXIT(ret);
}
+
/**
* try_load_from_uri_path() - Handle the URI device path
*
@@ -466,7 +492,6 @@ static efi_status_t try_load_from_uri_path(struct efi_device_path_uri *uridp,
{
char *s;
int err;
- int uri_len;
efi_status_t ret;
void *source_buffer;
efi_uintn_t source_size;
@@ -516,21 +541,19 @@ static efi_status_t try_load_from_uri_path(struct efi_device_path_uri *uridp,
image_size = ALIGN(image_size, SZ_2M);
/*
- * If the file extension is ".iso" or ".img", mount it and try to load
- * the default file.
- * If the file is PE-COFF image, load the downloaded file.
+ * Check if the downloaded file is a disk image or PE-COFF image.
+ * Try disk image detection first using prepare_loaded_image().
*/
- uri_len = strlen(uridp->uri);
- if (!strncmp(&uridp->uri[uri_len - 4], ".iso", 4) ||
- !strncmp(&uridp->uri[uri_len - 4], ".img", 4)) {
- ret = prepare_loaded_image(lo_label, image_addr, image_size,
- &loaded_dp, &blk);
- if (ret != EFI_SUCCESS)
- goto err;
+ /* First, try to treat the image as a disk image */
+ ret = prepare_loaded_image(lo_label, image_addr, image_size,
+ &loaded_dp, &blk);
+ if (ret == EFI_SUCCESS) {
+ /* Image is a disk image, set up for disk boot */
source_buffer = NULL;
source_size = 0;
} else if (efi_check_pe((void *)image_addr, image_size, NULL) == EFI_SUCCESS) {
+ /* Image is a PE-COFF executable */
/*
* loaded_dp must exist until efi application returns,
* will be freed in return_to_efibootmgr event callback.
@@ -545,7 +568,8 @@ static efi_status_t try_load_from_uri_path(struct efi_device_path_uri *uridp,
source_buffer = (void *)image_addr;
source_size = image_size;
} else {
- log_err("Error: file type is not supported\n");
+ /* Neither disk image nor PE-COFF */
+ log_err("Error: downloaded image is not supported\n");
ret = EFI_UNSUPPORTED;
goto err;
}
--
2.51.0
More information about the U-Boot
mailing list