diff options
| author | Tom Rini <trini@konsulko.com> | 2020-03-23 10:14:31 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2020-03-23 10:14:31 -0400 |
| commit | 0aadc0786e4a249cddd37efd8875f09e645be4cd (patch) | |
| tree | d3cdc126a08f57744dea9275f5c44495adeddf61 /lib/efi_selftest/efi_selftest_variables.c | |
| parent | 14eb12a3c801c9b18c91bdce413e44930e008418 (diff) | |
| parent | 7a4e717b9c0c255137a58f3ab90f002fc3aade2b (diff) | |
Merge tag 'efi-2020-04-rc4-5' of https://gitlab.denx.de/u-boot/custodians/u-boot-efi
Pull request for UEFI sub-system for efi-2020-04-rc4 (5)
This series contains bug fixes for the UEFI sub-system:
* report correct variable length in GetNextVariable()
* correct copying direction if freestanding memmove()
* remove const for parameter of GetNextVariableName()
* correct function descriptions
Unit tests are added and adjusted.
Diffstat (limited to 'lib/efi_selftest/efi_selftest_variables.c')
| -rw-r--r-- | lib/efi_selftest/efi_selftest_variables.c | 10 |
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; |