TcgMeasureGptTable() function will receive untrusted GPT partition table, and parse\r
partition data carefully.\r
\r
-Copyright (c) 2009 - 2013, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2009 - 2015, Intel Corporation. All rights reserved.<BR>\r
This program and the accompanying materials \r
are licensed and made available under the terms and conditions of the BSD License \r
which accompanies this distribution. The full text of the license may be found at \r
#include <Protocol/TcgService.h>\r
#include <Protocol/BlockIo.h>\r
#include <Protocol/DiskIo.h>\r
-#include <Protocol/DevicePathToText.h>\r
#include <Protocol/FirmwareVolumeBlock.h>\r
\r
#include <Guid/MeasuredFvHob.h>\r
+#include <Guid/ZeroGuid.h>\r
\r
#include <Library/BaseLib.h>\r
#include <Library/DebugLib.h>\r
// Flag to check GPT partition. It only need be measured once.\r
//\r
BOOLEAN mMeasureGptTableFlag = FALSE;\r
-EFI_GUID mZeroGuid = {0, 0, 0, {0, 0, 0, 0, 0, 0, 0, 0}};\r
UINTN mMeasureGptCount = 0;\r
VOID *mFileBuffer;\r
-UINTN mImageSize;\r
+UINTN mTpmImageSize;\r
//\r
// Measured FV handle cache\r
//\r
}\r
\r
EndPosition = FileOffset + *ReadSize;\r
- if (EndPosition > mImageSize) {\r
- *ReadSize = (UINT32)(mImageSize - FileOffset);\r
+ if (EndPosition > mTpmImageSize) {\r
+ *ReadSize = (UINT32)(mTpmImageSize - FileOffset);\r
}\r
\r
- if (FileOffset >= mImageSize) {\r
+ if (FileOffset >= mTpmImageSize) {\r
*ReadSize = 0;\r
}\r
\r
PartitionEntry = (EFI_PARTITION_ENTRY *)EntryPtr;\r
NumberOfPartition = 0;\r
for (Index = 0; Index < PrimaryHeader->NumberOfPartitionEntries; Index++) {\r
- if (!CompareGuid (&PartitionEntry->PartitionTypeGUID, &mZeroGuid)) {\r
+ if (!CompareGuid (&PartitionEntry->PartitionTypeGUID, &gZeroGuid)) {\r
NumberOfPartition++; \r
}\r
PartitionEntry = (EFI_PARTITION_ENTRY *)((UINT8 *)PartitionEntry + PrimaryHeader->SizeOfPartitionEntry);\r
PartitionEntry = (EFI_PARTITION_ENTRY*)EntryPtr;\r
NumberOfPartition = 0;\r
for (Index = 0; Index < PrimaryHeader->NumberOfPartitionEntries; Index++) {\r
- if (!CompareGuid (&PartitionEntry->PartitionTypeGUID, &mZeroGuid)) {\r
+ if (!CompareGuid (&PartitionEntry->PartitionTypeGUID, &gZeroGuid)) {\r
CopyMem (\r
(UINT8 *)&GptData->Partitions + NumberOfPartition * PrimaryHeader->SizeOfPartitionEntry,\r
(UINT8 *)PartitionEntry,\r
ImageLoad->ImageLengthInMemory = ImageSize;\r
ImageLoad->ImageLinkTimeAddress = LinkTimeBase;\r
ImageLoad->LengthOfDevicePath = FilePathSize;\r
- CopyMem (ImageLoad->DevicePath, FilePath, FilePathSize);\r
+ if ((FilePath != NULL) && (FilePathSize != 0)) {\r
+ CopyMem (ImageLoad->DevicePath, FilePath, FilePathSize);\r
+ }\r
\r
//\r
// Check PE/COFF image\r
&EventLogLocation,\r
&EventLogLastEntry\r
);\r
- if (EFI_ERROR (Status) || ProtocolCapability.TPMDeactivatedFlag) {\r
+ if (EFI_ERROR (Status) || ProtocolCapability.TPMDeactivatedFlag || (!ProtocolCapability.TPMPresentFlag)) {\r
//\r
// TPM device doesn't work or activate.\r
//\r
goto Finish;\r
}\r
\r
- mImageSize = FileSize;\r
+ mTpmImageSize = FileSize;\r
mFileBuffer = FileBuffer;\r
\r
//\r
// \r
DEBUG_CODE_BEGIN ();\r
CHAR16 *ToText;\r
- EFI_DEVICE_PATH_TO_TEXT_PROTOCOL *DevPathToText;\r
- Status = gBS->LocateProtocol (\r
- &gEfiDevicePathToTextProtocolGuid,\r
- NULL,\r
- (VOID **) &DevPathToText\r
- );\r
- if (!EFI_ERROR (Status)) {\r
- ToText = DevPathToText->ConvertDevicePathToText (\r
- DevicePathNode,\r
- FALSE,\r
- TRUE\r
- );\r
- if (ToText != NULL) {\r
- DEBUG ((DEBUG_INFO, "The measured image path is %s.\n", ToText));\r
- }\r
+ ToText = ConvertDevicePathToText (\r
+ DevicePathNode,\r
+ FALSE,\r
+ TRUE\r
+ );\r
+ if (ToText != NULL) {\r
+ DEBUG ((DEBUG_INFO, "The measured image path is %s.\n", ToText));\r
+ FreePool (ToText);\r
}\r
DEBUG_CODE_END ();\r
\r