efi_loader: check parameters of CreateEvent

[oweals/u-boot.git] / lib / efi_loader / efi_boottime.c

diff --git a/lib/efi_loader/efi_boottime.c b/lib/efi_loader/efi_boottime.c
index eeefe0bdfe3bb1a813318a19143571748cc54bcb..86cb9ba479a585c27af948e15cc08b480f751fe8 100644 (file)
--- a/lib/efi_loader/efi_boottime.c
+++ b/lib/efi_loader/efi_boottime.c
@@ -190,6 +190,25 @@ static void efi_queue_event(struct efi_event *event, bool check_tpl)
        event->is_queued = false;
 }
 
+/**
+ * is_valid_tpl() - check if the task priority level is valid
+ *
+ * @tpl:               TPL level to check
+ * ReturnValue:                status code
+ */
+efi_status_t is_valid_tpl(efi_uintn_t tpl)
+{
+       switch (tpl) {
+       case TPL_APPLICATION:
+       case TPL_CALLBACK:
+       case TPL_NOTIFY:
+       case TPL_HIGH_LEVEL:
+               return EFI_SUCCESS;
+       default:
+               return EFI_INVALID_PARAMETER;
+       }
+}
+
 /**
  * efi_signal_event() - signal an EFI event
  * @event:     event to signal
@@ -592,11 +611,21 @@ efi_status_t efi_create_event(uint32_t type, efi_uintn_t notify_tpl,
        if (event == NULL)
                return EFI_INVALID_PARAMETER;
 
-       if ((type & EVT_NOTIFY_SIGNAL) && (type & EVT_NOTIFY_WAIT))
+       switch (type) {
+       case 0:
+       case EVT_TIMER:
+       case EVT_NOTIFY_SIGNAL:
+       case EVT_TIMER | EVT_NOTIFY_SIGNAL:
+       case EVT_NOTIFY_WAIT:
+       case EVT_TIMER | EVT_NOTIFY_WAIT:
+       case EVT_SIGNAL_EXIT_BOOT_SERVICES:
+       case EVT_SIGNAL_VIRTUAL_ADDRESS_CHANGE:
+               break;
+       default:
                return EFI_INVALID_PARAMETER;
+       }
 
-       if ((type & (EVT_NOTIFY_SIGNAL | EVT_NOTIFY_WAIT)) &&
-           notify_function == NULL)
+       if (is_valid_tpl(notify_tpl) != EFI_SUCCESS)
                return EFI_INVALID_PARAMETER;
 
        evt = calloc(1, sizeof(struct efi_event));
@@ -2302,7 +2331,7 @@ static efi_status_t EFIAPI efi_install_multiple_protocol_interfaces(
 {
        EFI_ENTRY("%p", handle);
 
-       va_list argptr;
+       efi_va_list argptr;
        const efi_guid_t *protocol;
        void *protocol_interface;
        efi_status_t r = EFI_SUCCESS;
@@ -2311,12 +2340,12 @@ static efi_status_t EFIAPI efi_install_multiple_protocol_interfaces(
        if (!handle)
                return EFI_EXIT(EFI_INVALID_PARAMETER);
 
-       va_start(argptr, handle);
+       efi_va_start(argptr, handle);
        for (;;) {
-               protocol = va_arg(argptr, efi_guid_t*);
+               protocol = efi_va_arg(argptr, efi_guid_t*);
                if (!protocol)
                        break;
-               protocol_interface = va_arg(argptr, void*);
+               protocol_interface = efi_va_arg(argptr, void*);
                r = EFI_CALL(efi_install_protocol_interface(
                                                handle, protocol,
                                                EFI_NATIVE_INTERFACE,
@@ -2325,19 +2354,19 @@ static efi_status_t EFIAPI efi_install_multiple_protocol_interfaces(
                        break;
                i++;
        }
-       va_end(argptr);
+       efi_va_end(argptr);
        if (r == EFI_SUCCESS)
                return EFI_EXIT(r);
 
        /* If an error occurred undo all changes. */
-       va_start(argptr, handle);
+       efi_va_start(argptr, handle);
        for (; i; --i) {
-               protocol = va_arg(argptr, efi_guid_t*);
-               protocol_interface = va_arg(argptr, void*);
+               protocol = efi_va_arg(argptr, efi_guid_t*);
+               protocol_interface = efi_va_arg(argptr, void*);
                EFI_CALL(efi_uninstall_protocol_interface(handle, protocol,
                                                          protocol_interface));
        }
-       va_end(argptr);
+       efi_va_end(argptr);
 
        return EFI_EXIT(r);
 }
@@ -2361,7 +2390,7 @@ static efi_status_t EFIAPI efi_uninstall_multiple_protocol_interfaces(
 {
        EFI_ENTRY("%p", handle);
 
-       va_list argptr;
+       efi_va_list argptr;
        const efi_guid_t *protocol;
        void *protocol_interface;
        efi_status_t r = EFI_SUCCESS;
@@ -2370,12 +2399,12 @@ static efi_status_t EFIAPI efi_uninstall_multiple_protocol_interfaces(
        if (!handle)
                return EFI_EXIT(EFI_INVALID_PARAMETER);
 
-       va_start(argptr, handle);
+       efi_va_start(argptr, handle);
        for (;;) {
-               protocol = va_arg(argptr, efi_guid_t*);
+               protocol = efi_va_arg(argptr, efi_guid_t*);
                if (!protocol)
                        break;
-               protocol_interface = va_arg(argptr, void*);
+               protocol_interface = efi_va_arg(argptr, void*);
                r = EFI_CALL(efi_uninstall_protocol_interface(
                                                handle, protocol,
                                                protocol_interface));
@@ -2383,20 +2412,20 @@ static efi_status_t EFIAPI efi_uninstall_multiple_protocol_interfaces(
                        break;
                i++;
        }
-       va_end(argptr);
+       efi_va_end(argptr);
        if (r == EFI_SUCCESS)
                return EFI_EXIT(r);
 
        /* If an error occurred undo all changes. */
-       va_start(argptr, handle);
+       efi_va_start(argptr, handle);
        for (; i; --i) {
-               protocol = va_arg(argptr, efi_guid_t*);
-               protocol_interface = va_arg(argptr, void*);
+               protocol = efi_va_arg(argptr, efi_guid_t*);
+               protocol_interface = efi_va_arg(argptr, void*);
                EFI_CALL(efi_install_protocol_interface(&handle, protocol,
                                                        EFI_NATIVE_INTERFACE,
                                                        protocol_interface));
        }
-       va_end(argptr);
+       efi_va_end(argptr);
 
        return EFI_EXIT(r);
 }