colin/u-boot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

efi_loader: efi_disk_register() should not fail

Browse Source 
Our algorithm for creating USB device paths may lead to duplicate device
paths which result in efi_disk_register() failing. Instead we should just
skip devices that cannot be registered as EFI block devices.

Fix a memory leak in efi_disk_add_dev() caused by the duplicate device
path.

Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt@canonical.com>
This commit is contained in:
Heinrich Schuchardt
2021-11-20 13:56:02 +01:00
parent 3f73e79de8
commit cd9a26bfe5
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/efi_loader/efi_disk.c
View File

@@ -424,7 +424,7 @@ static efi_status_t efi_disk_add_dev(
&efi_block_io_guid, &diskobj->ops, &efi_block_io_guid, &diskobj->ops,
guid, NULL, NULL)); guid, NULL, NULL));
if (ret != EFI_SUCCESS) if (ret != EFI_SUCCESS)
return ret; goto error;
/* /*
* On partitions or whole disks without partitions install the * On partitions or whole disks without partitions install the
@@ -573,7 +573,7 @@ efi_status_t efi_disk_register(void)
if (ret) { if (ret) {
log_err("ERROR: failure to add disk device %s, r = %lu\n", log_err("ERROR: failure to add disk device %s, r = %lu\n",
dev->name, ret & ~EFI_ERROR_MASK); dev->name, ret & ~EFI_ERROR_MASK);
return ret; continue;
} }
disks++; disks++;