OvmfPkg/PlatformInitLib: Add check to NvVarStoreFV HeaderLength

There should be a check that the FV HeaderLength cannot be an odd
number. Otherwise in the following CalculateSum16 there would be an
ASSERT.

In ValidateFvHeader@QemuFlashFvbServicesRuntimeDxe/FwBlockServices.c
there a is similar check to the FwVolHeader->HeaderLength.

Cc: Erdem Aktas <erdemaktas@google.com>
Cc: James Bottomley <jejb@linux.ibm.com>
Cc: Jiewen Yao <jiewen.yao@intel.com>
Cc: Gerd Hoffmann <kraxel@redhat.com>
Cc: Tom Lendacky <thomas.lendacky@amd.com>
Signed-off-by: Min Xu <min.m.xu@intel.com>
Reviewed-by: Jiewen Yao <jiewen.yao@intel.com>

diff --git a/OvmfPkg/Library/PlatformInitLib/Platform.c b/OvmfPkg/Library/PlatformInitLib/Platform.c
index 2582689ffe3518508e9ee6fcac0355fcf5e4140d..77f22de046f2c1e62b7a9eeceec8b19c5bc77491 100644 (file)
--- a/OvmfPkg/Library/PlatformInitLib/Platform.c
+++ b/OvmfPkg/Library/PlatformInitLib/Platform.c
@@ -653,6 +653,7 @@ PlatformValidateNvVarStore (
       (!CompareGuid (&FvHdrGUID, &NvVarStoreFvHeader->FileSystemGuid)) ||\r
       (NvVarStoreFvHeader->Signature != EFI_FVH_SIGNATURE) ||\r
       (NvVarStoreFvHeader->Attributes != 0x4feff) ||\r
+      ((NvVarStoreFvHeader->HeaderLength & 0x01) != 0) ||\r
       (NvVarStoreFvHeader->Revision != EFI_FVH_REVISION) ||\r
       (NvVarStoreFvHeader->FvLength != NvVarStoreSize)\r
       )\r