Correct the PeImage Source file to be measured by TCG.

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

diff --git a/MdeModulePkg/Core/Dxe/Image/Image.c b/MdeModulePkg/Core/Dxe/Image/Image.c
index 125134dea7299dd7d6c7020090ee8deccc974d67..3587460990d3435fea6ed32db8667be0fe38a349 100644 (file)
--- a/MdeModulePkg/Core/Dxe/Image/Image.c
+++ b/MdeModulePkg/Core/Dxe/Image/Image.c
@@ -208,7 +208,9 @@ Returns:
   UINTN                     Size;\r
   UINTN                     LinkTimeBase;\r
   EFI_TCG_PLATFORM_PROTOCOL *TcgPlatformProtocol;\r
+  IMAGE_FILE_HANDLE         *FHandle;\r
 \r
+  FHandle = NULL;\r
   ZeroMem (&Image->ImageContext, sizeof (Image->ImageContext));\r
 \r
   Image->ImageContext.Handle    = Pe32Handle;\r
@@ -362,17 +364,18 @@ Returns:
              NULL,\r
              (VOID **) &TcgPlatformProtocol\r
              );\r
-  if (!EFI_ERROR (Status)) {    \r
+  if (!EFI_ERROR (Status)) {\r
+    FHandle = (IMAGE_FILE_HANDLE *) Image->ImageContext.Handle;\r
     Status = TcgPlatformProtocol->MeasurePeImage (\r
                                     BootPolicy,\r
-                                    Image->ImageContext.ImageAddress,\r
-                                    (UINTN) Image->ImageContext.ImageSize,\r
+                                    (EFI_PHYSICAL_ADDRESS) (UINTN) FHandle->Source,\r
+                                    FHandle->SourceSize,\r
                                     LinkTimeBase,\r
                                     Image->ImageContext.ImageType,\r
                                     Image->Info.DeviceHandle,\r
                                     Image->Info.FilePath\r
                                     );\r
-    \r
+\r
     ASSERT_EFI_ERROR (Status);\r
   }\r
 \r