Searching for files starts on an 8 byte aligned boundary after the end of the Extended Header if it exists.

Signed-off-by: lzeng14
Reviewed-by: lgao4

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@13143 6f19259b-4bc3-4df7-8a09-765794883524

1 files changed, 12 insertions, 2 deletions

diff --git a/MdeModulePkg/Core/Dxe/FwVol/FwVol.c b/MdeModulePkg/Core/Dxe/FwVol/FwVol.c
index 66b7673..1cee6a9 100644
--- a/MdeModulePkg/Core/Dxe/FwVol/FwVol.c
+++ b/MdeModulePkg/Core/Dxe/FwVol/FwVol.c
@@ -294,6 +294,7 @@ FvCheck (
   EFI_STATUS                            Status;

   EFI_FIRMWARE_VOLUME_BLOCK_PROTOCOL    *Fvb;

   EFI_FIRMWARE_VOLUME_HEADER            *FwVolHeader;

+  EFI_FIRMWARE_VOLUME_EXT_HEADER        *FwVolExtHeader;

   EFI_FVB_ATTRIBUTES_2                  FvbAttributes;

   EFI_FV_BLOCK_MAP_ENTRY                *BlockMap;

   FFS_FILE_LIST_ENTRY                   *FfsFileEntry;

@@ -410,7 +411,7 @@ FvCheck (
 

   //

   // go through the whole FV cache, check the consistence of the FV.

-  // Make a linked list off all the Ffs file headers

+  // Make a linked list of all the Ffs file headers

   //

   Status = EFI_SUCCESS;

   InitializeListHead (&FvDevice->FfsFileListHeader);

@@ -418,7 +419,16 @@ FvCheck (
   //

   // Build FFS list

   //

-  FfsHeader = (EFI_FFS_FILE_HEADER *) FvDevice->CachedFv;

+  if (FwVolHeader->ExtHeaderOffset != 0) {

+    //

+    // Searching for files starts on an 8 byte aligned boundary after the end of the Extended Header if it exists.

+    //

+    FwVolExtHeader = (EFI_FIRMWARE_VOLUME_EXT_HEADER *) (FvDevice->CachedFv + (FwVolHeader->ExtHeaderOffset - FwVolHeader->HeaderLength));

+    FfsHeader = (EFI_FFS_FILE_HEADER *) ((UINT8 *) FwVolExtHeader + FwVolExtHeader->ExtHeaderSize);

+    FfsHeader = (EFI_FFS_FILE_HEADER *) ALIGN_POINTER (FfsHeader, 8);

+  } else {

+    FfsHeader = (EFI_FFS_FILE_HEADER *) (FvDevice->CachedFv);

+  }

   TopFvAddress = FvDevice->EndOfCachedFv;

   while ((UINT8 *) FfsHeader < TopFvAddress) {