Merge tag 'efi-2019-07-rc3-3' of git://git.denx.de/u-boot-efi

[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 699f4184d932c1b3870951dd7d06e43ceb659d32..50bc10537f404002f6927d1cce0133a797ea9fd2 100644 (file)
--- a/lib/efi_loader/efi_variable.c
+++ b/lib/efi_loader/efi_variable.c
@@ -180,7 +180,7 @@ efi_status_t EFIAPI efi_get_variable(u16 *variable_name,
        if (ret)
                return EFI_EXIT(ret);
 
-       debug("%s: get '%s'\n", __func__, native_name);
+       EFI_PRINT("get '%s'\n", native_name);
 
        val = env_get(native_name);
        free(native_name);
@@ -202,8 +202,10 @@ efi_status_t EFIAPI efi_get_variable(u16 *variable_name,
                len /= 2;
                *data_size = len;
 
-               if (in_size < len)
-                       return EFI_EXIT(EFI_BUFFER_TOO_SMALL);
+               if (in_size < len) {
+                       ret = EFI_BUFFER_TOO_SMALL;
+                       goto out;
+               }
 
                if (!data)
                        return EFI_EXIT(EFI_INVALID_PARAMETER);
@@ -211,14 +213,16 @@ efi_status_t EFIAPI efi_get_variable(u16 *variable_name,
                if (hex2bin(data, s, len))
                        return EFI_EXIT(EFI_DEVICE_ERROR);
 
-               debug("%s: got value: \"%s\"\n", __func__, s);
+               EFI_PRINT("got value: \"%s\"\n", s);
        } else if ((s = prefix(val, "(utf8)"))) {
                unsigned len = strlen(s) + 1;
 
                *data_size = len;
 
-               if (in_size < len)
-                       return EFI_EXIT(EFI_BUFFER_TOO_SMALL);
+               if (in_size < len) {
+                       ret = EFI_BUFFER_TOO_SMALL;
+                       goto out;
+               }
 
                if (!data)
                        return EFI_EXIT(EFI_INVALID_PARAMETER);
@@ -226,16 +230,17 @@ efi_status_t EFIAPI efi_get_variable(u16 *variable_name,
                memcpy(data, s, len);
                ((char *)data)[len] = '\0';
 
-               debug("%s: got value: \"%s\"\n", __func__, (char *)data);
+               EFI_PRINT("got value: \"%s\"\n", (char *)data);
        } else {
-               debug("%s: invalid value: '%s'\n", __func__, val);
+               EFI_PRINT("invalid value: '%s'\n", val);
                return EFI_EXIT(EFI_DEVICE_ERROR);
        }
 
+out:
        if (attributes)
                *attributes = attr & EFI_VARIABLE_MASK;
 
-       return EFI_EXIT(EFI_SUCCESS);
+       return EFI_EXIT(ret);
 }
 
 static char *efi_variables_list;
@@ -422,7 +427,9 @@ efi_status_t EFIAPI efi_set_variable(u16 *variable_name,
        EFI_ENTRY("\"%ls\" %pUl %x %zu %p", variable_name, vendor, attributes,
                  data_size, data);
 
-       if (!variable_name || !vendor) {
+       /* TODO: implement APPEND_WRITE */
+       if (!variable_name || !vendor ||
+           (attributes & EFI_VARIABLE_APPEND_WRITE)) {
                ret = EFI_INVALID_PARAMETER;
                goto out;
        }
@@ -444,12 +451,21 @@ efi_status_t EFIAPI efi_set_variable(u16 *variable_name,
        if (val) {
                parse_attr(val, &attr);
 
+               /* We should not free val */
+               val = NULL;
                if (attr & READ_ONLY) {
-                       /* We should not free val */
-                       val = NULL;
                        ret = EFI_WRITE_PROTECTED;
                        goto out;
                }
+
+               /*
+                * attributes won't be changed
+                * TODO: take care of APPEND_WRITE once supported
+                */
+               if (attr != attributes) {
+                       ret = EFI_INVALID_PARAMETER;
+                       goto out;
+               }
        }
 
        val = malloc(2 * data_size + strlen("{ro,run,boot}(blob)") + 1);
@@ -485,7 +501,7 @@ efi_status_t EFIAPI efi_set_variable(u16 *variable_name,
        s = bin2hex(s, data, data_size);
        *s = '\0';
 
-       debug("%s: setting: %s=%s\n", __func__, native_name, val);
+       EFI_PRINT("setting: %s=%s\n", native_name, val);
 
        if (env_set(native_name, val))
                ret = EFI_DEVICE_ERROR;