The block IO protocol may be installed on any handle. We should make no assumption about the structure the handle points to.
efi_disk_is_system_part() makes an illegal widening cast from a handle to a struct efi_disk_obj. Remove the function.
Fixes: Fixes: 41fd506842c2 ("efi_loader: disk: add efi_disk_is_system_part()") Signed-off-by: Heinrich Schuchardt heinrich.schuchardt@canonical.com --- v2: correctly detect ESP --- include/efi_loader.h | 2 -- lib/efi_loader/efi_capsule.c | 11 +++++++++-- lib/efi_loader/efi_disk.c | 29 ----------------------------- 3 files changed, 9 insertions(+), 33 deletions(-)
diff --git a/include/efi_loader.h b/include/efi_loader.h index 156056fcd3..af36639ec6 100644 --- a/include/efi_loader.h +++ b/include/efi_loader.h @@ -541,8 +541,6 @@ efi_status_t tcg2_measure_pe_image(void *efi, u64 efi_size, int efi_disk_create_partitions(efi_handle_t parent, struct blk_desc *desc, const char *if_typename, int diskid, const char *pdevname); -/* Check if it is EFI system partition */ -bool efi_disk_is_system_part(efi_handle_t handle); /* Called by bootefi to make GOP (graphical) interface available */ efi_status_t efi_gop_register(void); /* Called by bootefi to make the network interface available */ diff --git a/lib/efi_loader/efi_capsule.c b/lib/efi_loader/efi_capsule.c index 3d80d98c1f..ae4a278bad 100644 --- a/lib/efi_loader/efi_capsule.c +++ b/lib/efi_loader/efi_capsule.c @@ -670,22 +670,29 @@ static efi_status_t get_dp_device(u16 *boot_var,
/** * device_is_present_and_system_part - check if a device exists - * @dp Device path * * Check if a device pointed to by the device path, @dp, exists and is * located in UEFI system partition. * + * @dp device path * Return: true - yes, false - no */ static bool device_is_present_and_system_part(struct efi_device_path *dp) { efi_handle_t handle; + struct efi_device_path *rem;
+ /* Check device exists */ handle = efi_dp_find_obj(dp, NULL, NULL); if (!handle) return false;
- return efi_disk_is_system_part(handle); + /* Check device is on system partition */ + handle = efi_dp_find_obj(dp, &efi_system_partition_guid, &rem); + if (!handle) + return false; + + return true; }
/** diff --git a/lib/efi_loader/efi_disk.c b/lib/efi_loader/efi_disk.c index d36a35d94f..c905c12abc 100644 --- a/lib/efi_loader/efi_disk.c +++ b/lib/efi_loader/efi_disk.c @@ -587,32 +587,3 @@ efi_status_t efi_disk_register(void)
return EFI_SUCCESS; } - -/** - * efi_disk_is_system_part() - check if handle refers to an EFI system partition - * - * @handle: handle of partition - * - * Return: true if handle refers to an EFI system partition - */ -bool efi_disk_is_system_part(efi_handle_t handle) -{ - struct efi_handler *handler; - struct efi_disk_obj *diskobj; - struct disk_partition info; - efi_status_t ret; - int r; - - /* check if this is a block device */ - ret = efi_search_protocol(handle, &efi_block_io_guid, &handler); - if (ret != EFI_SUCCESS) - return false; - - diskobj = container_of(handle, struct efi_disk_obj, header); - - r = part_get_info(diskobj->desc, diskobj->part, &info); - if (r) - return false; - - return !!(info.bootable & PART_EFI_SYSTEM_PARTITION); -}