From patchwork Fri Mar 20 18:28:20 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Heinrich Schuchardt X-Patchwork-Id: 244028 List-Id: U-Boot discussion From: xypron.glpk at gmx.de (Heinrich Schuchardt) Date: Fri, 20 Mar 2020 19:28:20 +0100 Subject: [PATCH 2/2] efi_selftest: check length report by GetNextVariableName() In-Reply-To: <20200320182820.149823-1-xypron.glpk@gmx.de> References: <20200320182820.149823-1-xypron.glpk@gmx.de> Message-ID: <20200320182820.149823-3-xypron.glpk@gmx.de> 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 --- lib/efi_selftest/efi_selftest_variables.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) -- 2.25.1 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")) flag |= 2;