efi_loader: correct includes in efi_variable.c

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

diff --git a/lib/efi_loader/efi_variable.c b/lib/efi_loader/efi_variable.c
index 889a7f2ba06f4a0189b9d988e40c4f07aa6c4f9c..46f35bc60ba0d4cfdbeed1cf3c02758864ee4bce 100644 (file)
--- a/lib/efi_loader/efi_variable.c
+++ b/lib/efi_loader/efi_variable.c
@@ -5,13 +5,12 @@
  *  Copyright (c) 2017 Rob Clark
  */
 
-#include <malloc.h>
-#include <charset.h>
+#include <common.h>
 #include <efi_loader.h>
+#include <env_internal.h>
 #include <hexdump.h>
-#include <environment.h>
+#include <malloc.h>
 #include <search.h>
-#include <uuid.h>
 
 #define READ_ONLY BIT(31)
 
@@ -423,17 +422,17 @@ efi_status_t EFIAPI efi_set_variable(u16 *variable_name,
                                     efi_uintn_t data_size, const void *data)
 {
        char *native_name = NULL, *val = NULL, *s;
+       const char *old_val;
+       size_t old_size;
        efi_status_t ret = EFI_SUCCESS;
        u32 attr;
 
        EFI_ENTRY("\"%ls\" %pUl %x %zu %p", variable_name, vendor, attributes,
                  data_size, data);
 
-       /* TODO: implement APPEND_WRITE */
        if (!variable_name || !*variable_name || !vendor ||
            ((attributes & EFI_VARIABLE_RUNTIME_ACCESS) &&
-            !(attributes & EFI_VARIABLE_BOOTSERVICE_ACCESS)) ||
-           (attributes & EFI_VARIABLE_APPEND_WRITE)) {
+            !(attributes & EFI_VARIABLE_BOOTSERVICE_ACCESS))) {
                ret = EFI_INVALID_PARAMETER;
                goto out;
        }
@@ -442,37 +441,56 @@ efi_status_t EFIAPI efi_set_variable(u16 *variable_name,
        if (ret)
                goto out;
 
-#define ACCESS_ATTR (EFI_VARIABLE_RUNTIME_ACCESS | EFI_VARIABLE_BOOTSERVICE_ACCESS)
-
-       if ((data_size == 0) || !(attributes & ACCESS_ATTR)) {
-               /* delete the variable: */
-               env_set(native_name, NULL);
-               ret = EFI_SUCCESS;
-               goto out;
-       }
-
-       val = env_get(native_name);
-       if (val) {
-               parse_attr(val, &attr);
+       old_val = env_get(native_name);
+       if (old_val) {
+               old_val = parse_attr(old_val, &attr);
 
-               /* We should not free val */
-               val = NULL;
+               /* check read-only first */
                if (attr & READ_ONLY) {
                        ret = EFI_WRITE_PROTECTED;
                        goto out;
                }
 
-               /*
-                * attributes won't be changed
-                * TODO: take care of APPEND_WRITE once supported
-                */
-               if (attr != attributes) {
+               if ((data_size == 0 &&
+                    !(attributes & EFI_VARIABLE_APPEND_WRITE)) ||
+                   !attributes) {
+                       /* delete the variable: */
+                       env_set(native_name, NULL);
+                       ret = EFI_SUCCESS;
+                       goto out;
+               }
+
+               /* attributes won't be changed */
+               if (attr != (attributes & ~EFI_VARIABLE_APPEND_WRITE)) {
                        ret = EFI_INVALID_PARAMETER;
                        goto out;
                }
+
+               if (attributes & EFI_VARIABLE_APPEND_WRITE) {
+                       if (!prefix(old_val, "(blob)")) {
+                               ret = EFI_DEVICE_ERROR;
+                               goto out;
+                       }
+                       old_size = strlen(old_val);
+               } else {
+                       old_size = 0;
+               }
+       } else {
+               if (data_size == 0 || !attributes ||
+                   (attributes & EFI_VARIABLE_APPEND_WRITE)) {
+                       /*
+                        * Trying to delete or to update a non-existent
+                        * variable.
+                        */
+                       ret = EFI_NOT_FOUND;
+                       goto out;
+               }
+
+               old_size = 0;
        }
 
-       val = malloc(2 * data_size + strlen("{ro,run,boot,nv}(blob)") + 1);
+       val = malloc(old_size + 2 * data_size
+                    + strlen("{ro,run,boot,nv}(blob)") + 1);
        if (!val) {
                ret = EFI_OUT_OF_RESOURCES;
                goto out;
@@ -480,10 +498,7 @@ efi_status_t EFIAPI efi_set_variable(u16 *variable_name,
 
        s = val;
 
-       /*
-        * store attributes
-        * TODO: several attributes are not supported
-        */
+       /* store attributes */
        attributes &= (EFI_VARIABLE_NON_VOLATILE |
                       EFI_VARIABLE_BOOTSERVICE_ACCESS |
                       EFI_VARIABLE_RUNTIME_ACCESS);
@@ -504,8 +519,13 @@ efi_status_t EFIAPI efi_set_variable(u16 *variable_name,
        }
        s += sprintf(s, "}");
 
+       if (old_size)
+               /* APPEND_WRITE */
+               s += sprintf(s, old_val);
+       else
+               s += sprintf(s, "(blob)");
+
        /* store payload: */
-       s += sprintf(s, "(blob)");
        s = bin2hex(s, data, data_size);
        *s = '\0';