summaryrefslogtreecommitdiff
path: root/lib/efi_selftest/efi_selftest_variables.c
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2020-03-31 17:24:19 -0400
committerTom Rini <trini@konsulko.com>2020-03-31 17:24:19 -0400
commit2b18b89156335bf1f0d84f81d3597762bc48c61d (patch)
tree544e93c39bfaeff20b2ac47980de27edf1a585e4 /lib/efi_selftest/efi_selftest_variables.c
parent779e6dc6a429ac28dfd4f07ab0c3648a31399d4a (diff)
parentac28e59a574dd231a4787752d923f618587e3d10 (diff)
Merge branch 'next' of git://git.denx.de/u-boot-usb into next
Diffstat (limited to 'lib/efi_selftest/efi_selftest_variables.c')
-rw-r--r--lib/efi_selftest/efi_selftest_variables.c10
1 files changed, 8 insertions, 2 deletions
diff --git a/lib/efi_selftest/efi_selftest_variables.c b/lib/efi_selftest/efi_selftest_variables.c
index 5d98c029b86..2c16f3db6cc 100644
--- a/lib/efi_selftest/efi_selftest_variables.c
+++ b/lib/efi_selftest/efi_selftest_variables.c
@@ -11,7 +11,7 @@
#include <efi_selftest.h>
#define EFI_ST_MAX_DATA_SIZE 16
-#define EFI_ST_MAX_VARNAME_SIZE 40
+#define EFI_ST_MAX_VARNAME_SIZE 80
static struct efi_boot_services *boottime;
static struct efi_runtime_services *runtime;
@@ -155,8 +155,14 @@ static int execute(void)
return EFI_ST_FAILURE;
}
if (!memcmp(&guid, &guid_vendor0, sizeof(efi_guid_t)) &&
- !efi_st_strcmp_16_8(varname, "efi_st_var0"))
+ !efi_st_strcmp_16_8(varname, "efi_st_var0")) {
flag |= 1;
+ if (len != 24) {
+ efi_st_error("GetNextVariableName report wrong length %u, expected 24\n",
+ (unsigned int)len);
+ return EFI_ST_FAILURE;
+ }
+ }
if (!memcmp(&guid, &guid_vendor1, sizeof(efi_guid_t)) &&
!efi_st_strcmp_16_8(varname, "efi_st_var1"))
flag |= 2;