On Fri, Mar 20, 2020 at 07:28:20PM +0100, Heinrich Schuchardt wrote: > GetNextVariableName should report the length of the variable including the > final 0x0000 in bytes. > > Check this in the unit test. > > Signed-off-by: Heinrich Schuchardt <[email protected]> > --- > lib/efi_selftest/efi_selftest_variables.c | 8 +++++++- > 1 file changed, 7 insertions(+), 1 deletion(-) > > diff --git a/lib/efi_selftest/efi_selftest_variables.c > b/lib/efi_selftest/efi_selftest_variables.c > index 5d98c029b8..b7ead340f5 100644 > --- a/lib/efi_selftest/efi_selftest_variables.c > +++ b/lib/efi_selftest/efi_selftest_variables.c > @@ -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"))
Logically, length check should be added here, too. -Takahiro Akashi > flag |= 2; > -- > 2.25.1 >
