script: Make get_default_envs.sh script exclude tools/env

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

diff --git a/lib/efi_loader/efi_variable.c b/lib/efi_loader/efi_variable.c
index 6c177da3a6054339ae77296a4d6dab2fd0fc523d..90b637215e43db1fee9456cbdf73cab838903cdf 100644 (file)
--- a/lib/efi_loader/efi_variable.c
+++ b/lib/efi_loader/efi_variable.c
@@ -1,9 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  *  EFI utils
  *
  *  Copyright (c) 2017 Rob Clark
- *
- *  SPDX-License-Identifier:     GPL-2.0+
  */
 
 #include <malloc.h>
@@ -50,7 +49,7 @@
        (strlen("efi_xxxxxxxx-xxxx-xxxx-xxxxxxxxxxxxxxxx_") + \
                (MAX_VAR_NAME * MAX_UTF8_PER_UTF16))
 
-static int hex(unsigned char ch)
+static int hex(int ch)
 {
        if (ch >= 'a' && ch <= 'f')
                return ch-'a'+10;
@@ -61,44 +60,32 @@ static int hex(unsigned char ch)
        return -1;
 }
 
-static const char *hex2mem(u8 *mem, const char *hexstr, int count)
+static int hex2mem(u8 *mem, const char *hexstr, int size)
 {
-       memset(mem, 0, count/2);
-
-       do {
-               int nibble;
+       int nibble;
+       int i;
 
-               *mem = 0;
-
-               if (!count || !*hexstr)
+       for (i = 0; i < size; i++) {
+               if (*hexstr == '\0')
                        break;
 
                nibble = hex(*hexstr);
                if (nibble < 0)
-                       break;
+                       return -1;
 
                *mem = nibble;
-               count--;
                hexstr++;
 
-               if (!count || !*hexstr)
-                       break;
-
                nibble = hex(*hexstr);
                if (nibble < 0)
-                       break;
+                       return -1;
 
                *mem = (*mem << 4) | nibble;
-               count--;
                hexstr++;
                mem++;
+       }
 
-       } while (1);
-
-       if (*hexstr)
-               return hexstr;
-
-       return NULL;
+       return i;
 }
 
 static char *mem2hex(char *hexstr, const u8 *mem, int count)
@@ -114,8 +101,8 @@ static char *mem2hex(char *hexstr, const u8 *mem, int count)
        return hexstr;
 }
 
-static efi_status_t efi_to_native(char *native, s16 *variable_name,
-               efi_guid_t *vendor)
+static efi_status_t efi_to_native(char *native, u16 *variable_name,
+                                 efi_guid_t *vendor)
 {
        size_t len;
 
@@ -177,9 +164,9 @@ static const char *parse_attr(const char *str, u32 *attrp)
 }
 
 /* http://wiki.phoenix.com/wiki/index.php/EFI_RUNTIME_SERVICES#GetVariable.28.29 */
-efi_status_t EFIAPI efi_get_variable(s16 *variable_name,
-               efi_guid_t *vendor, u32 *attributes,
-               unsigned long *data_size, void *data)
+efi_status_t EFIAPI efi_get_variable(u16 *variable_name, efi_guid_t *vendor,
+                                    u32 *attributes, efi_uintn_t *data_size,
+                                    void *data)
 {
        char native_name[MAX_NATIVE_VAR_NAME + 1];
        efi_status_t ret;
@@ -210,8 +197,12 @@ efi_status_t EFIAPI efi_get_variable(s16 *variable_name,
        if ((s = prefix(val, "(blob)"))) {
                unsigned len = strlen(s);
 
+               /* number of hexadecimal digits must be even */
+               if (len & 1)
+                       return EFI_EXIT(EFI_DEVICE_ERROR);
+
                /* two characters per byte: */
-               len = DIV_ROUND_UP(len, 2);
+               len /= 2;
                *data_size = len;
 
                if (in_size < len)
@@ -220,7 +211,7 @@ efi_status_t EFIAPI efi_get_variable(s16 *variable_name,
                if (!data)
                        return EFI_EXIT(EFI_INVALID_PARAMETER);
 
-               if (hex2mem(data, s, len * 2))
+               if (hex2mem(data, s, len) != len)
                        return EFI_EXIT(EFI_DEVICE_ERROR);
 
                debug("%s: got value: \"%s\"\n", __func__, s);
@@ -251,9 +242,9 @@ efi_status_t EFIAPI efi_get_variable(s16 *variable_name,
 }
 
 /* http://wiki.phoenix.com/wiki/index.php/EFI_RUNTIME_SERVICES#GetNextVariableName.28.29 */
-efi_status_t EFIAPI efi_get_next_variable(
-               unsigned long *variable_name_size,
-               s16 *variable_name, efi_guid_t *vendor)
+efi_status_t EFIAPI efi_get_next_variable_name(efi_uintn_t *variable_name_size,
+                                              u16 *variable_name,
+                                              efi_guid_t *vendor)
 {
        EFI_ENTRY("%p \"%ls\" %pUl", variable_name_size, variable_name, vendor);
 
@@ -261,16 +252,16 @@ efi_status_t EFIAPI efi_get_next_variable(
 }
 
 /* http://wiki.phoenix.com/wiki/index.php/EFI_RUNTIME_SERVICES#SetVariable.28.29 */
-efi_status_t EFIAPI efi_set_variable(s16 *variable_name,
-               efi_guid_t *vendor, u32 attributes,
-               unsigned long data_size, void *data)
+efi_status_t EFIAPI efi_set_variable(u16 *variable_name, efi_guid_t *vendor,
+                                    u32 attributes, efi_uintn_t data_size,
+                                    void *data)
 {
        char native_name[MAX_NATIVE_VAR_NAME + 1];
        efi_status_t ret = EFI_SUCCESS;
        char *val, *s;
        u32 attr;
 
-       EFI_ENTRY("\"%ls\" %pUl %x %lu %p", variable_name, vendor, attributes,
+       EFI_ENTRY("\"%ls\" %pUl %x %zu %p", variable_name, vendor, attributes,
                  data_size, data);
 
        if (!variable_name || !vendor)