tyler.durden
/
audk
mirror of https://github.com/acidanthera/audk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix the issue that FreePool is too early in FirmwarePerformanceDxe. 

Signed-off-by: Liming Gao <liming.gao@intel.com>
Reviewed-by: Star Zeng <star.zeng@intel.com>

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@14388 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
lgao4 2013-05-27 05:45:35 +00:00
parent 0df625fad7
commit 9cf37b4018
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
MdeModulePkg/Universal/Acpi/FirmwarePerformanceDataTableDxe/FirmwarePerformanceDxe.c
View File

@ -356,14 +356,15 @@ InstallFirmwarePerformanceDataTable (
// //
// Collect boot records from SMM drivers. // Collect boot records from SMM drivers.
// //
SmmBootRecordCommBuffer = AllocateZeroPool (SMM_BOOT_RECORD_COMM_SIZE); SmmBootRecordCommBuffer = NULL;
ASSERT (SmmBootRecordCommBuffer != NULL); SmmCommData = NULL;
SmmCommData = NULL;
Status = gBS->LocateProtocol (&gEfiSmmCommunicationProtocolGuid, NULL, (VOID **) &Communication); Status = gBS->LocateProtocol (&gEfiSmmCommunicationProtocolGuid, NULL, (VOID **) &Communication);
if (!EFI_ERROR (Status)) { if (!EFI_ERROR (Status)) {
// //
// Initialize communicate buffer // Initialize communicate buffer
// //
SmmBootRecordCommBuffer = AllocateZeroPool (SMM_BOOT_RECORD_COMM_SIZE);
ASSERT (SmmBootRecordCommBuffer != NULL);
SmmCommBufferHeader = (EFI_SMM_COMMUNICATE_HEADER*)SmmBootRecordCommBuffer; SmmCommBufferHeader = (EFI_SMM_COMMUNICATE_HEADER*)SmmBootRecordCommBuffer;
SmmCommData = (SMM_BOOT_RECORD_COMMUNICATE*)SmmCommBufferHeader->Data; SmmCommData = (SMM_BOOT_RECORD_COMMUNICATE*)SmmCommBufferHeader->Data;
ZeroMem((UINT8*)SmmCommData, sizeof(SMM_BOOT_RECORD_COMMUNICATE)); ZeroMem((UINT8*)SmmCommData, sizeof(SMM_BOOT_RECORD_COMMUNICATE));
@ -393,7 +394,6 @@ InstallFirmwarePerformanceDataTable (
ASSERT_EFI_ERROR(SmmCommData->ReturnStatus); ASSERT_EFI_ERROR(SmmCommData->ReturnStatus);
} }
} }
FreePool (SmmBootRecordCommBuffer);
// //
// Prepare memory for Boot Performance table. // Prepare memory for Boot Performance table.
@ -440,6 +440,9 @@ InstallFirmwarePerformanceDataTable (
if (SmmCommData != NULL && SmmCommData->BootRecordData != NULL) { if (SmmCommData != NULL && SmmCommData->BootRecordData != NULL) {
FreePool (SmmCommData->BootRecordData); FreePool (SmmCommData->BootRecordData);
} }
if (SmmBootRecordCommBuffer != NULL) {
FreePool (SmmBootRecordCommBuffer);
}
if (mAcpiS3PerformanceTable != NULL) { if (mAcpiS3PerformanceTable != NULL) {
FreePages (mAcpiS3PerformanceTable, EFI_SIZE_TO_PAGES (sizeof (S3_PERFORMANCE_TABLE))); FreePages (mAcpiS3PerformanceTable, EFI_SIZE_TO_PAGES (sizeof (S3_PERFORMANCE_TABLE)));
} }
@ -470,6 +473,10 @@ InstallFirmwarePerformanceDataTable (
mAcpiBootPerformanceTable->Header.Length = (UINT32) (mAcpiBootPerformanceTable->Header.Length + SmmCommData->BootRecordSize); mAcpiBootPerformanceTable->Header.Length = (UINT32) (mAcpiBootPerformanceTable->Header.Length + SmmCommData->BootRecordSize);
BootPerformanceData = BootPerformanceData + SmmCommData->BootRecordSize; BootPerformanceData = BootPerformanceData + SmmCommData->BootRecordSize;
} }
if (SmmBootRecordCommBuffer != NULL) {
FreePool (SmmBootRecordCommBuffer);
}
// //
// Save Boot Performance Table address to Variable for use in S4 resume. // Save Boot Performance Table address to Variable for use in S4 resume.
// //