efi_loader: eliminate efi_set_(non)volatile_variable

Eliminate superfluous functions efi_set_volatile_variable() and
efi_set_nonvolatile_variable().

Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de>

diff --git a/lib/efi_loader/efi_variable.c b/lib/efi_loader/efi_variable.c
index ceb6b17b00405ca73ebaf18a78eff1043f896e22..b9c2e4ebf685a9a963fe7d51baaa8915ab2ec5ad 100644 (file)
--- a/lib/efi_loader/efi_variable.c
+++ b/lib/efi_loader/efi_variable.c
@@ -169,12 +169,12 @@ static const char *parse_attr(const char *str, u32 *attrp, u64 *timep)
        return str;
 }
 
        return str;
 }
 

-static efi_status_t efi_set_variable_internal(u16 *variable_name,
-                                             const efi_guid_t *vendor,
-                                             u32 attributes,
-                                             efi_uintn_t data_size,
-                                             const void *data,
-                                             bool ro_check);
+static efi_status_t efi_set_variable_common(u16 *variable_name,
+                                           const efi_guid_t *vendor,
+                                           u32 attributes,
+                                           efi_uintn_t data_size,
+                                           const void *data,
+                                           bool ro_check);

 
 /**
  * efi_set_secure_state - modify secure boot state variables
 
 /**
  * efi_set_secure_state - modify secure boot state variables


@@ -196,35 +196,28 @@ static efi_status_t efi_set_secure_state(int sec_boot, int setup_mode,
        attributes = EFI_VARIABLE_BOOTSERVICE_ACCESS |
                     EFI_VARIABLE_RUNTIME_ACCESS |
                     READ_ONLY;
        attributes = EFI_VARIABLE_BOOTSERVICE_ACCESS |
                     EFI_VARIABLE_RUNTIME_ACCESS |
                     READ_ONLY;

-       ret = efi_set_variable_internal(L"SecureBoot",
-                                       &efi_global_variable_guid,
-                                       attributes,
-                                       sizeof(sec_boot), &sec_boot,
-                                       false);
+       ret = efi_set_variable_common(L"SecureBoot", &efi_global_variable_guid,
+                                     attributes, sizeof(sec_boot), &sec_boot,
+                                     false);

        if (ret != EFI_SUCCESS)
                goto err;
 
        if (ret != EFI_SUCCESS)
                goto err;
 

-       ret = efi_set_variable_internal(L"SetupMode",
-                                       &efi_global_variable_guid,
-                                       attributes,
-                                       sizeof(setup_mode), &setup_mode,
-                                       false);
+       ret = efi_set_variable_common(L"SetupMode", &efi_global_variable_guid,
+                                     attributes, sizeof(setup_mode),
+                                     &setup_mode, false);

        if (ret != EFI_SUCCESS)
                goto err;
 
        if (ret != EFI_SUCCESS)
                goto err;
 

-       ret = efi_set_variable_internal(L"AuditMode",
-                                       &efi_global_variable_guid,
-                                       attributes,
-                                       sizeof(audit_mode), &audit_mode,
-                                       false);
+       ret = efi_set_variable_common(L"AuditMode", &efi_global_variable_guid,
+                                     attributes, sizeof(audit_mode),
+                                     &audit_mode, false);

        if (ret != EFI_SUCCESS)
                goto err;
 
        if (ret != EFI_SUCCESS)
                goto err;
 

-       ret = efi_set_variable_internal(L"DeployedMode",
-                                       &efi_global_variable_guid,
-                                       attributes,
-                                       sizeof(deployed_mode), &deployed_mode,
-                                       false);
+       ret = efi_set_variable_common(L"DeployedMode",
+                                     &efi_global_variable_guid, attributes,
+                                     sizeof(deployed_mode), &deployed_mode,
+                                     false);

 err:
        return ret;
 }
 err:
        return ret;
 }


@@ -234,7 +227,7 @@ err:
  * @mode:      new state
  *
  * Depending on @mode, secure boot related variables are updated.
  * @mode:      new state
  *
  * Depending on @mode, secure boot related variables are updated.

- * Those variables are *read-only* for users, efi_set_variable_internal()
+ * Those variables are *read-only* for users, efi_set_variable_common()

  * is called here.
  *
  * Return:     EFI_SUCCESS on success, status code (negative) on error
  * is called here.
  *
  * Return:     EFI_SUCCESS on success, status code (negative) on error


@@ -252,11 +245,10 @@ static efi_status_t efi_transfer_secure_state(enum efi_secure_mode mode)
 
                efi_secure_boot = true;
        } else if (mode == EFI_MODE_AUDIT) {
 
                efi_secure_boot = true;
        } else if (mode == EFI_MODE_AUDIT) {

-               ret = efi_set_variable_internal(
-                                       L"PK", &efi_global_variable_guid,
-                                       EFI_VARIABLE_BOOTSERVICE_ACCESS |
-                                       EFI_VARIABLE_RUNTIME_ACCESS,
-                                       0, NULL, false);
+               ret = efi_set_variable_common(L"PK", &efi_global_variable_guid,
+                                             EFI_VARIABLE_BOOTSERVICE_ACCESS |
+                                             EFI_VARIABLE_RUNTIME_ACCESS,
+                                             0, NULL, false);

                if (ret != EFI_SUCCESS)
                        goto err;
 
                if (ret != EFI_SUCCESS)
                        goto err;
 


@@ -326,14 +318,13 @@ static efi_status_t efi_init_secure_state(void)
 
        ret = efi_transfer_secure_state(mode);
        if (ret == EFI_SUCCESS)
 
        ret = efi_transfer_secure_state(mode);
        if (ret == EFI_SUCCESS)

-               ret = efi_set_variable_internal(L"VendorKeys",
-                                               &efi_global_variable_guid,
-                                               EFI_VARIABLE_BOOTSERVICE_ACCESS
-                                                | EFI_VARIABLE_RUNTIME_ACCESS
-                                                | READ_ONLY,
-                                               sizeof(efi_vendor_keys),
-                                               &efi_vendor_keys,
-                                               false);
+               ret = efi_set_variable_common(L"VendorKeys",
+                                             &efi_global_variable_guid,
+                                             EFI_VARIABLE_BOOTSERVICE_ACCESS |
+                                             EFI_VARIABLE_RUNTIME_ACCESS |
+                                             READ_ONLY,
+                                             sizeof(efi_vendor_keys),
+                                             &efi_vendor_keys, false);

 
 err:
        return ret;
 
 err:
        return ret;


@@ -872,14 +863,12 @@ efi_status_t EFIAPI efi_get_next_variable_name(efi_uintn_t *variable_name_size,
        return EFI_EXIT(ret);
 }
 
        return EFI_EXIT(ret);
 }
 

-static
-efi_status_t EFIAPI efi_set_variable_common(u16 *variable_name,
+static efi_status_t efi_set_variable_common(u16 *variable_name,

                                            const efi_guid_t *vendor,
                                            u32 attributes,
                                            efi_uintn_t data_size,
                                            const void *data,
                                            const efi_guid_t *vendor,
                                            u32 attributes,
                                            efi_uintn_t data_size,
                                            const void *data,

-                                           bool ro_check,
-                                           bool is_non_volatile)
+                                           bool ro_check)

 {
        char *native_name = NULL, *old_data = NULL, *val = NULL, *s;
        efi_uintn_t old_size;
 {
        char *native_name = NULL, *old_data = NULL, *val = NULL, *s;
        efi_uintn_t old_size;


@@ -906,14 +895,6 @@ efi_status_t EFIAPI efi_set_variable_common(u16 *variable_name,
        attr = 0;
        ret = EFI_CALL(efi_get_variable(variable_name, vendor, &attr,
                                        &old_size, NULL));
        attr = 0;
        ret = EFI_CALL(efi_get_variable(variable_name, vendor, &attr,
                                        &old_size, NULL));

-       if (ret == EFI_BUFFER_TOO_SMALL) {
-               if ((is_non_volatile && !(attr & EFI_VARIABLE_NON_VOLATILE)) ||
-                   (!is_non_volatile && (attr & EFI_VARIABLE_NON_VOLATILE))) {
-                       ret = EFI_INVALID_PARAMETER;
-                       goto err;
-               }
-       }
-

        append = !!(attributes & EFI_VARIABLE_APPEND_WRITE);
        attributes &= ~(u32)EFI_VARIABLE_APPEND_WRITE;
        delete = !append && (!data_size || !attributes);
        append = !!(attributes & EFI_VARIABLE_APPEND_WRITE);
        attributes &= ~(u32)EFI_VARIABLE_APPEND_WRITE;
        delete = !append && (!data_size || !attributes);


@@ -1087,7 +1068,7 @@ out:
                /* update VendorKeys */
                if (vendor_keys_modified & efi_vendor_keys) {
                        efi_vendor_keys = 0;
                /* update VendorKeys */
                if (vendor_keys_modified & efi_vendor_keys) {
                        efi_vendor_keys = 0;

-                       ret = efi_set_variable_internal(
+                       ret = efi_set_variable_common(

                                                L"VendorKeys",
                                                &efi_global_variable_guid,
                                                EFI_VARIABLE_BOOTSERVICE_ACCESS
                                                L"VendorKeys",
                                                &efi_global_variable_guid,
                                                EFI_VARIABLE_BOOTSERVICE_ACCESS


@@ -1109,54 +1090,6 @@ err:
        return ret;
 }
 
        return ret;
 }
 

-static
-efi_status_t EFIAPI efi_set_volatile_variable(u16 *variable_name,
-                                             const efi_guid_t *vendor,
-                                             u32 attributes,
-                                             efi_uintn_t data_size,
-                                             const void *data,
-                                             bool ro_check)
-{
-       return efi_set_variable_common(variable_name, vendor, attributes,
-                                      data_size, data, ro_check, false);
-}
-
-efi_status_t EFIAPI efi_set_nonvolatile_variable(u16 *variable_name,
-                                                const efi_guid_t *vendor,
-                                                u32 attributes,
-                                                efi_uintn_t data_size,
-                                                const void *data,
-                                                bool ro_check)
-{
-       efi_status_t ret;
-
-       ret = efi_set_variable_common(variable_name, vendor, attributes,
-                                     data_size, data, ro_check, true);
-
-       return ret;
-}
-
-static efi_status_t efi_set_variable_internal(u16 *variable_name,
-                                             const efi_guid_t *vendor,
-                                             u32 attributes,
-                                             efi_uintn_t data_size,
-                                             const void *data,
-                                             bool ro_check)
-{
-       efi_status_t ret;
-
-       if (attributes & EFI_VARIABLE_NON_VOLATILE)
-               ret = efi_set_nonvolatile_variable(variable_name, vendor,
-                                                  attributes,
-                                                  data_size, data, ro_check);
-       else
-               ret = efi_set_volatile_variable(variable_name, vendor,
-                                               attributes, data_size, data,
-                                               ro_check);
-
-       return ret;
-}
-

 /**
  * efi_set_variable() - set value of a UEFI variable
  *
 /**
  * efi_set_variable() - set value of a UEFI variable
  *


@@ -1182,9 +1115,9 @@ efi_status_t EFIAPI efi_set_variable(u16 *variable_name,
        /* READ_ONLY bit is not part of API */
        attributes &= ~(u32)READ_ONLY;
 
        /* READ_ONLY bit is not part of API */
        attributes &= ~(u32)READ_ONLY;
 

-       return EFI_EXIT(efi_set_variable_internal(variable_name, vendor,
-                                                 attributes, data_size, data,
-                                                 true));
+       return EFI_EXIT(efi_set_variable_common(variable_name, vendor,
+                                               attributes, data_size, data,
+                                               true));

 }
 
 /**
 }
 
 /**