MdeModulePkg DxeCore: Add FVH signature check before VerifyFvHeaderChecksum in FwVol.

[mirror_edk2.git] / MdeModulePkg / Core / Dxe / FwVol / FwVol.c

diff --git a/MdeModulePkg/Core/Dxe/FwVol/FwVol.c b/MdeModulePkg/Core/Dxe/FwVol/FwVol.c
index 4fa177ed7c93359af1adf79ec6423037b3139dbf..a7b272b4d697518b9a62e7e02ac209d93e61be53 100644 (file)
--- a/MdeModulePkg/Core/Dxe/FwVol/FwVol.c
+++ b/MdeModulePkg/Core/Dxe/FwVol/FwVol.c
@@ -658,6 +658,14 @@ NotifyFwVolBlock (
     }\r
     ASSERT (FwVolHeader != NULL);\r
 \r
+    //\r
+    // Validate FV Header signature, if not as expected, continue.\r
+    //\r
+    if (FwVolHeader->Signature != EFI_FVH_SIGNATURE) {\r
+      CoreFreePool (FwVolHeader);\r
+      continue;\r
+    }\r
+\r
     if (!VerifyFvHeaderChecksum (FwVolHeader)) {\r
       CoreFreePool (FwVolHeader);\r
       continue;\r