[U-Boot] [PATCH v2 04/12] efi_loader: implement UninstallProtocolInterface

[Heinrich Schuchardt]

Without the patch efi_uninstall_protocol_interface always returns an
error.

With the patch protocols without interface can be uninstalled.

Signed-off-by: Heinrich Schuchardt <xypron.g...@gmx.de>
---
v2
        Check if protocol != NULL to avoid illegal memory access.
---
 lib/efi_loader/efi_boottime.c | 40 ++++++++++++++++++++++++++++++++++++++--
 1 file changed, 38 insertions(+), 2 deletions(-)

diff --git a/lib/efi_loader/efi_boottime.c b/lib/efi_loader/efi_boottime.c
index 97b2dce8b3..6c64b94e4a 100644
--- a/lib/efi_loader/efi_boottime.c
+++ b/lib/efi_loader/efi_boottime.c
@@ -372,8 +372,44 @@ static efi_status_t EFIAPI 
efi_reinstall_protocol_interface(void *handle,
 static efi_status_t EFIAPI efi_uninstall_protocol_interface(void *handle,
                        efi_guid_t *protocol, void *protocol_interface)
 {
+       struct list_head *lhandle;
+       int i;
+       efi_status_t r = EFI_NOT_FOUND;
+
        EFI_ENTRY("%p, %p, %p", handle, protocol, protocol_interface);
-       return EFI_EXIT(EFI_NOT_FOUND);
+
+       if (!handle || !protocol) {
+               r = EFI_INVALID_PARAMETER;
+               goto out;
+       }
+
+       list_for_each(lhandle, &efi_obj_list) {
+               struct efi_object *efiobj;
+               efiobj = list_entry(lhandle, struct efi_object, link);
+
+               if (efiobj->handle != handle)
+                       continue;
+
+               for (i = 0; i < ARRAY_SIZE(efiobj->protocols); i++) {
+                       struct efi_handler *handler = &efiobj->protocols[i];
+                       const efi_guid_t *hprotocol = handler->guid;
+
+                       if (!hprotocol)
+                               continue;
+                       if (!guidcmp(hprotocol, protocol)) {
+                               if (handler->protocol_interface) {
+                                       r = EFI_ACCESS_DENIED;
+                               } else {
+                                       handler->guid = 0;
+                                       r = EFI_SUCCESS;
+                               }
+                               goto out;
+                       }
+               }
+       }
+
+out:
+       return EFI_EXIT(r);
 }
 
 static efi_status_t EFIAPI efi_register_protocol_notify(efi_guid_t *protocol,
@@ -814,7 +850,7 @@ static efi_status_t EFIAPI efi_open_protocol(
                        struct efi_handler *handler = &efiobj->protocols[i];
                        const efi_guid_t *hprotocol = handler->guid;
                        if (!hprotocol)
-                               break;
+                               continue;
                        if (!guidcmp(hprotocol, protocol)) {
                                if (attributes !=
                                    EFI_OPEN_PROTOCOL_TEST_PROTOCOL) {
-- 
2.11.0

_______________________________________________
U-Boot mailing list
U-Boot@lists.denx.de
https://lists.denx.de/listinfo/u-boot