diff options
| author | Tom Rini <trini@konsulko.com> | 2023-06-02 12:13:01 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2023-06-02 12:13:01 -0400 |
| commit | 26659d426548d1c395ef878c3b820e53a6e3b346 (patch) | |
| tree | a048fa8cae729388804f9076d57a99bff17a643d /lib/efi_loader/efi_device_path.c | |
| parent | cb4437e530ec1ff3deae85754010344afab8bcc5 (diff) | |
| parent | 75ebeb4d94bd911ee7884b7beae06f3dec2838a8 (diff) | |
Merge tag 'efi-2023-07-rc4' of https://source.denx.de/u-boot/custodians/u-boot-efi
Pull request efi-2023-07-rc4
Documentation:
* man pages for loadb, loadx
UEFI:
* check return value of part_get_info()
* improve unit test for RegisterProtocolNotify()
Diffstat (limited to 'lib/efi_loader/efi_device_path.c')
| -rw-r--r-- | lib/efi_loader/efi_device_path.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/lib/efi_loader/efi_device_path.c b/lib/efi_loader/efi_device_path.c index 71923b11273..04ebb449caa 100644 --- a/lib/efi_loader/efi_device_path.c +++ b/lib/efi_loader/efi_device_path.c @@ -843,12 +843,17 @@ static unsigned dp_part_size(struct blk_desc *desc, int part) * @buf buffer to which the device path is written * @desc block device descriptor * @part partition number, 0 identifies a block device + * + * Return: pointer to position after the node */ static void *dp_part_node(void *buf, struct blk_desc *desc, int part) { struct disk_partition info; + int ret; - part_get_info(desc, part, &info); + ret = part_get_info(desc, part, &info); + if (ret < 0) + return buf; if (desc->part_type == PART_TYPE_ISO) { struct efi_device_path_cdrom_path *cddp = buf; |