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

3 files changed, 4 insertions, 12 deletions

diff --git a/MdePkg/Library/BasePeCoffLib/BasePeCoff.c b/MdePkg/Library/BasePeCoffLib/BasePeCoff.c
index 6342a665df..69c649a32a 100644
--- a/MdePkg/Library/BasePeCoffLib/BasePeCoff.c
+++ b/MdePkg/Library/BasePeCoffLib/BasePeCoff.c
@@ -144,10 +144,6 @@ PeCoffLoaderGetPeHeader (
         return RETURN_UNSUPPORTED;

       }

 

-      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)) {

-        return RETURN_UNSUPPORTED;

-      }

-

       //

       // 2. Check the OptionalHeader.SizeOfHeaders field.

       // This field will be use like the following mode, so just compare the result.

@@ -221,10 +217,6 @@ PeCoffLoaderGetPeHeader (
         return RETURN_UNSUPPORTED;

       }

 

-      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)) {

-        return RETURN_UNSUPPORTED;

-      }

-

       //

       // 2. Check the OptionalHeader.SizeOfHeaders field.

       // This field will be use like the following mode, so just compare the result.

diff --git a/SecurityPkg/Library/DxeImageVerificationLib/DxeImageVerificationLib.c b/SecurityPkg/Library/DxeImageVerificationLib/DxeImageVerificationLib.c
index 6e3e9eea95..14cd2d73b4 100644
--- a/SecurityPkg/Library/DxeImageVerificationLib/DxeImageVerificationLib.c
+++ b/SecurityPkg/Library/DxeImageVerificationLib/DxeImageVerificationLib.c
@@ -67,7 +67,7 @@ HASH_TABLE mHash[] = {
 **/

 EFI_STATUS

 EFIAPI

-ImageRead (

+DxeImageVerificationLibImageRead (

   IN     VOID    *FileHandle,

   IN     UINTN   FileOffset,

   IN OUT UINTN   *ReadSize,

@@ -1272,7 +1272,7 @@ DxeImageVerificationHandler (
 

   ZeroMem (&ImageContext, sizeof (ImageContext));

   ImageContext.Handle    = (VOID *) FileBuffer;

-  ImageContext.ImageRead = (PE_COFF_LOADER_READ_FILE) ImageRead;

+  ImageContext.ImageRead = (PE_COFF_LOADER_READ_FILE) DxeImageVerificationLibImageRead;

 

   //

   // Get information about the image being loaded

diff --git a/SecurityPkg/Library/DxeTpmMeasureBootLib/DxeTpmMeasureBootLib.c b/SecurityPkg/Library/DxeTpmMeasureBootLib/DxeTpmMeasureBootLib.c
index f0039c8048..17c41e9bae 100644
--- a/SecurityPkg/Library/DxeTpmMeasureBootLib/DxeTpmMeasureBootLib.c
+++ b/SecurityPkg/Library/DxeTpmMeasureBootLib/DxeTpmMeasureBootLib.c
@@ -52,7 +52,7 @@ UINTN                             mImageSize;
 **/

 EFI_STATUS

 EFIAPI

-ImageRead (

+DxeTpmMeasureBootLibImageRead (

   IN     VOID    *FileHandle,

   IN     UINTN   FileOffset,

   IN OUT UINTN   *ReadSize,

@@ -774,7 +774,7 @@ DxeTpmMeasureBootHandler (
   DevicePathNode = OrigDevicePathNode;

   ZeroMem (&ImageContext, sizeof (ImageContext));

   ImageContext.Handle    = (VOID *) FileBuffer;

-  ImageContext.ImageRead = (PE_COFF_LOADER_READ_FILE) ImageRead;

+  ImageContext.ImageRead = (PE_COFF_LOADER_READ_FILE) DxeTpmMeasureBootLibImageRead;

 

   //

   // Get information about the image being loaded