Patch include:

1.Change function name to avoid name conflict.
2.Refine check for Pe Image.

Signed-off-by: Eric Dong <eric.dong@intel.com>
Reviewed-by: Liming Gao <liming.gao@intel.com>
git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@13220 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/MdePkg/Library/BasePeCoffLib/BasePeCoff.c b/MdePkg/Library/BasePeCoffLib/BasePeCoff.c
index 6342a665df329875aa2d1f983fec681974f7e826..69c649a32a1bc404f1d4a583d682985332a8b242 100644 (file)
--- a/MdePkg/Library/BasePeCoffLib/BasePeCoff.c
+++ b/MdePkg/Library/BasePeCoffLib/BasePeCoff.c
@@ -144,10 +144,6 @@ PeCoffLoaderGetPeHeader (
         return RETURN_UNSUPPORTED;\r
       }\r
 \r
-      if (Hdr.Pe32->FileHeader.SizeOfOptionalHeader != sizeof (EFI_IMAGE_OPTIONAL_HEADER32) - (EFI_IMAGE_NUMBER_OF_DIRECTORY_ENTRIES - Hdr.Pe32->OptionalHeader.NumberOfRvaAndSizes) * sizeof (EFI_IMAGE_DATA_DIRECTORY)) {\r
-        return RETURN_UNSUPPORTED;\r
-      }\r
-\r
       //\r
       // 2. Check the OptionalHeader.SizeOfHeaders field.\r
       // This field will be use like the following mode, so just compare the result.\r
@@ -221,10 +217,6 @@ PeCoffLoaderGetPeHeader (
         return RETURN_UNSUPPORTED;\r
       }\r
 \r
-      if (Hdr.Pe32Plus->FileHeader.SizeOfOptionalHeader != sizeof (EFI_IMAGE_OPTIONAL_HEADER32) - (EFI_IMAGE_NUMBER_OF_DIRECTORY_ENTRIES - Hdr.Pe32Plus->OptionalHeader.NumberOfRvaAndSizes) * sizeof (EFI_IMAGE_DATA_DIRECTORY)) {\r
-        return RETURN_UNSUPPORTED;\r
-      }\r
-\r
       //\r
       // 2. Check the OptionalHeader.SizeOfHeaders field.\r
       // This field will be use like the following mode, so just compare the result.\r

diff --git a/SecurityPkg/Library/DxeImageVerificationLib/DxeImageVerificationLib.c b/SecurityPkg/Library/DxeImageVerificationLib/DxeImageVerificationLib.c
index 6e3e9eea95200a7a5b73ea230ffc39de3bbae490..14cd2d73b4c1600a09813b497154f7ab44908c33 100644 (file)
--- a/SecurityPkg/Library/DxeImageVerificationLib/DxeImageVerificationLib.c
+++ b/SecurityPkg/Library/DxeImageVerificationLib/DxeImageVerificationLib.c
@@ -67,7 +67,7 @@ HASH_TABLE mHash[] = {
 **/\r
 EFI_STATUS\r
 EFIAPI\r
-ImageRead (\r
+DxeImageVerificationLibImageRead (\r
   IN     VOID    *FileHandle,\r
   IN     UINTN   FileOffset,\r
   IN OUT UINTN   *ReadSize,\r
@@ -1272,7 +1272,7 @@ DxeImageVerificationHandler (
 \r
   ZeroMem (&ImageContext, sizeof (ImageContext));\r
   ImageContext.Handle    = (VOID *) FileBuffer;\r
-  ImageContext.ImageRead = (PE_COFF_LOADER_READ_FILE) ImageRead;\r
+  ImageContext.ImageRead = (PE_COFF_LOADER_READ_FILE) DxeImageVerificationLibImageRead;\r
 \r
   //\r
   // Get information about the image being loaded\r

diff --git a/SecurityPkg/Library/DxeTpmMeasureBootLib/DxeTpmMeasureBootLib.c b/SecurityPkg/Library/DxeTpmMeasureBootLib/DxeTpmMeasureBootLib.c
index f0039c80483af7c1e56ca2958b1ba94ce75c6d6f..17c41e9bae4c17149d873c10f9627784878fdcc2 100644 (file)
--- a/SecurityPkg/Library/DxeTpmMeasureBootLib/DxeTpmMeasureBootLib.c
+++ b/SecurityPkg/Library/DxeTpmMeasureBootLib/DxeTpmMeasureBootLib.c
@@ -52,7 +52,7 @@ UINTN                             mImageSize;
 **/\r
 EFI_STATUS\r
 EFIAPI\r
-ImageRead (\r
+DxeTpmMeasureBootLibImageRead (\r
   IN     VOID    *FileHandle,\r
   IN     UINTN   FileOffset,\r
   IN OUT UINTN   *ReadSize,\r
@@ -774,7 +774,7 @@ DxeTpmMeasureBootHandler (
   DevicePathNode = OrigDevicePathNode;\r
   ZeroMem (&ImageContext, sizeof (ImageContext));\r
   ImageContext.Handle    = (VOID *) FileBuffer;\r
-  ImageContext.ImageRead = (PE_COFF_LOADER_READ_FILE) ImageRead;\r
+  ImageContext.ImageRead = (PE_COFF_LOADER_READ_FILE) DxeTpmMeasureBootLibImageRead;\r
 \r
   //\r
   // Get information about the image being loaded\r