Djam/u-boot
1
0
Fork 0
mirror of https://github.com/u-boot/u-boot.git synced 2025-04-20 20:04:46 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

efi_loader: efi_dp_find_obj() add protocol check

Browse source 
Let function efi_dp_find_obj() additionally check if a given protocol is
installed on the handle relating to the device-path.

Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt@canonical.com>
This commit is contained in:
Heinrich Schuchardt 2022-03-19 06:35:43 +01:00
parent c409593d08
commit e46ef1db9e
5 changed files with 20 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
include/efi_loader.h
View file

@ -731,6 +731,7 @@ struct efi_device_path *efi_dp_next(const struct efi_device_path *dp);
int efi_dp_match(const struct efi_device_path *a, int efi_dp_match(const struct efi_device_path *a,
const struct efi_device_path *b); const struct efi_device_path *b);
efi_handle_t efi_dp_find_obj(struct efi_device_path *dp, efi_handle_t efi_dp_find_obj(struct efi_device_path *dp,
const efi_guid_t *guid,
struct efi_device_path **rem); struct efi_device_path **rem);
/* get size of the first device path instance excluding end node */ /* get size of the first device path instance excluding end node */
efi_uintn_t efi_dp_instance_size(const struct efi_device_path *dp); efi_uintn_t efi_dp_instance_size(const struct efi_device_path *dp);

2
lib/efi_loader/efi_boottime.c
View file

@ -1750,7 +1750,7 @@ efi_status_t efi_setup_loaded_image(struct efi_device_path *device_path,
info->system_table = &systab; info->system_table = &systab;
if (device_path) { if (device_path) {
info->device_handle = efi_dp_find_obj(device_path, NULL); info->device_handle = efi_dp_find_obj(device_path, NULL, NULL);
dp = efi_dp_append(device_path, file_path); dp = efi_dp_append(device_path, file_path);
if (!dp) { if (!dp) {

2
lib/efi_loader/efi_capsule.c
View file

@ -680,7 +680,7 @@ static bool device_is_present_and_system_part(struct efi_device_path *dp)
{ {
efi_handle_t handle; efi_handle_t handle;
handle = efi_dp_find_obj(dp, NULL); handle = efi_dp_find_obj(dp, NULL, NULL);
if (!handle) if (!handle)
return false; return false;

23
lib/efi_loader/efi_device_path.c
View file

@ -160,17 +160,19 @@ struct efi_device_path *efi_dp_shorten(struct efi_device_path *dp)
} }
/** /**
* find_handle() - find handle by device path * find_handle() - find handle by device path and installed protocol
* *
* If @rem is provided, the handle with the longest partial match is returned. * If @rem is provided, the handle with the longest partial match is returned.
* *
* @dp: device path to search * @dp: device path to search
* @guid: GUID of protocol that must be installed on path or NULL
* @short_path: use short form device path for matching * @short_path: use short form device path for matching
* @rem: pointer to receive remaining device path * @rem: pointer to receive remaining device path
* Return: matching handle * Return: matching handle
*/ */
static efi_handle_t find_handle(struct efi_device_path *dp, bool short_path, static efi_handle_t find_handle(struct efi_device_path *dp,
struct efi_device_path **rem) const efi_guid_t *guid, bool short_path,
struct efi_device_path **rem)
{ {
efi_handle_t handle, best_handle = NULL; efi_handle_t handle, best_handle = NULL;
efi_uintn_t len, best_len = 0; efi_uintn_t len, best_len = 0;
@ -183,6 +185,11 @@ static efi_handle_t find_handle(struct efi_device_path *dp, bool short_path,
efi_uintn_t len_current; efi_uintn_t len_current;
efi_status_t ret; efi_status_t ret;
if (guid) {
ret = efi_search_protocol(handle, guid, &handler);
if (ret != EFI_SUCCESS)
continue;
}
ret = efi_search_protocol(handle, &efi_guid_device_path, ret = efi_search_protocol(handle, &efi_guid_device_path,
&handler); &handler);
if (ret != EFI_SUCCESS) if (ret != EFI_SUCCESS)
@ -195,13 +202,13 @@ static efi_handle_t find_handle(struct efi_device_path *dp, bool short_path,
} }
len_current = efi_dp_instance_size(dp_current); len_current = efi_dp_instance_size(dp_current);
if (rem) { if (rem) {
if (len_current < len) if (len_current > len)
continue; continue;
} else { } else {
if (len_current != len) if (len_current != len)
continue; continue;
} }
if (memcmp(dp_current, dp, len)) if (memcmp(dp_current, dp, len_current))
continue; continue;
if (!rem) if (!rem)
return handle; return handle;
@ -220,18 +227,20 @@ static efi_handle_t find_handle(struct efi_device_path *dp, bool short_path,
* If @rem is provided, the handle with the longest partial match is returned. * If @rem is provided, the handle with the longest partial match is returned.
* *
* @dp: device path to search * @dp: device path to search
* @guid: GUID of protocol that must be installed on path or NULL
* @rem: pointer to receive remaining device path * @rem: pointer to receive remaining device path
* Return: matching handle * Return: matching handle
*/ */
efi_handle_t efi_dp_find_obj(struct efi_device_path *dp, efi_handle_t efi_dp_find_obj(struct efi_device_path *dp,
const efi_guid_t *guid,
struct efi_device_path **rem) struct efi_device_path **rem)
{ {
efi_handle_t handle; efi_handle_t handle;
handle = find_handle(dp, false, rem); handle = find_handle(dp, guid, false, rem);
if (!handle) if (!handle)
/* Match short form device path */ /* Match short form device path */
handle = find_handle(dp, true, rem); handle = find_handle(dp, guid, true, rem);
return handle; return handle;
} }

2
lib/efi_loader/efi_disk.c
View file

@ -302,7 +302,7 @@ efi_fs_from_path(struct efi_device_path *full_path)
efi_free_pool(file_path); efi_free_pool(file_path);
/* Get the EFI object for the partition */ /* Get the EFI object for the partition */
efiobj = efi_dp_find_obj(device_path, NULL); efiobj = efi_dp_find_obj(device_path, NULL, NULL);
efi_free_pool(device_path); efi_free_pool(device_path);
if (!efiobj) if (!efiobj)
return NULL; return NULL;