From: Ilias Apalodimas Date: Tue, 20 Jun 2023 06:19:30 +0000 (+0300) Subject: efi_loader: fix the return codes of UninstallProtocol X-Git-Url: http://git.dujemihanovic.xyz/?a=commitdiff_plain;h=748cb553ff9c1fefdfad540ea949c869ee9e3306;p=u-boot.git efi_loader: fix the return codes of UninstallProtocol Up to now we did not check the return value of DisconnectController. A previous patch is fixing that taking into account what happened during the controller disconnect. But that check takes place before our code is trying to figure out if the interface exists to begin with. In case a driver is not allowed to unbind -- e.g returning EFI_DEVICE_ERROR, we will end up returning that error instead of EFI_NOT_FOUND. Add an extra check on the top of the function to make sure the protocol interface exists before trying to disconnect any drivers Reviewed-by: Heinrich Schuchardt Signed-off-by: Ilias Apalodimas --- diff --git a/lib/efi_loader/efi_boottime.c b/lib/efi_loader/efi_boottime.c index d294db9d8c..2ca7359f3e 100644 --- a/lib/efi_loader/efi_boottime.c +++ b/lib/efi_loader/efi_boottime.c @@ -1373,6 +1373,8 @@ static efi_status_t efi_uninstall_protocol r = efi_search_protocol(handle, protocol, &handler); if (r != EFI_SUCCESS) goto out; + if (handler->protocol_interface != protocol_interface) + return EFI_NOT_FOUND; /* Disconnect controllers */ r = efi_disconnect_all_drivers(efiobj, protocol, NULL); if (r != EFI_SUCCESS) {