2 files changed, 1 insertions, 17 deletions
diff --git a/edk2/MdeModulePkg/Core/Dxe/FwVol/FwVol.c b/edk2/MdeModulePkg/Core/Dxe/FwVol/FwVol.c
index 1e1cbae36..07cbbb94d 100644
--- a/edk2/MdeModulePkg/Core/Dxe/FwVol/FwVol.c
+++ b/edk2/MdeModulePkg/Core/Dxe/FwVol/FwVol.c
@@ -357,7 +357,7 @@ FvCheck (
       //
       // Check whether FvHeader is crossing the multi block range.
       //
-      if (HeaderSize > BlockMap->Length) {
+      if (Index >= BlockMap->NumBlocks) {
         BlockMap++;
         continue;
       } else if (HeaderSize > 0) {
diff --git a/edk2/MdeModulePkg/Core/Dxe/FwVol/FwVolDriver.h b/edk2/MdeModulePkg/Core/Dxe/FwVol/FwVolDriver.h
index 7cc775f69..a614b93d1 100644
--- a/edk2/MdeModulePkg/Core/Dxe/FwVol/FwVolDriver.h
+++ b/edk2/MdeModulePkg/Core/Dxe/FwVol/FwVolDriver.h
@@ -366,22 +366,6 @@ SetFileState (
   IN EFI_FFS_FILE_HEADER  *FfsHeader
   );
 
-
-/**
-  Verify checksum of the firmware volume header.
-
-  @param  FvHeader       Points to the firmware volume header to be checked
-
-  @retval TRUE           Checksum verification passed
-  @retval FALSE          Checksum verification failed
-
-**/
-BOOLEAN
-VerifyFvHeaderChecksum (
-  IN EFI_FIRMWARE_VOLUME_HEADER *FvHeader
-  );
-
-
 /**
   Check if it's a valid FFS file header.