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

efi_driver: fix error handling

Browse Source 
If creating the block device fails,

* delete all created objects and references
* close the protocol interface on the controller

Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt@canonical.com>
This commit is contained in:
Heinrich Schuchardt
2022-10-03 10:35:35 +02:00
parent 16b27b67c5
commit 43a5891c66
3 changed files with 45 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
lib/efi_driver/efi_uclass.c
View File

@@ -11,7 +11,7 @@
* The uclass provides the bind, start, and stop entry points for the driver
* binding protocol.
*
* In bind() and stop() it checks if the controller implements the protocol
* In supported() and bind() it checks if the controller implements the protocol
* supported by the EFI driver. In the start() function it calls the bind()
* function of the EFI driver. In the stop() function it destroys the child
* controllers.
@@ -144,18 +144,19 @@ static efi_status_t EFIAPI efi_uc_start(
goto out;
}
ret = check_node_type(controller_handle);
if (ret != EFI_SUCCESS) {
r = EFI_CALL(systab.boottime->close_protocol(
controller_handle, bp->ops->protocol,
this->driver_binding_handle,
controller_handle));
if (r != EFI_SUCCESS)
EFI_PRINT("Failure to close handle\n");
if (ret != EFI_SUCCESS)
goto err;
ret = bp->ops->bind(controller_handle, interface);
if (ret == EFI_SUCCESS)
goto out;
}
/* TODO: driver specific stuff */
bp->ops->bind(controller_handle, interface);
err:
r = EFI_CALL(systab.boottime->close_protocol(
controller_handle, bp->ops->protocol,
this->driver_binding_handle,
controller_handle));
if (r != EFI_SUCCESS)
EFI_PRINT("Failure to close handle\n");
out:
return EFI_EXIT(ret);