sravan/system76-edk2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Prevent infinite recursion when ASSERT(), DEBUG(), or any other use of ReportStatusCode is performed at > TPL_NOTIFY or there is not enough memory to allocate a buffer for the ExtendedData associated with the status code being reported.

Browse Source 
git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@11022 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
vanjeff
2010-11-10 06:12:25 +00:00
parent 7018623cd4
commit cd73414527
1 changed files with 28 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
IntelFrameworkModulePkg/Library/DxeReportStatusCodeLibFramework/ReportStatusCodeLib.c
View File

@ -487,6 +487,8 @@ ReportStatusCodeEx (
{ {
EFI_STATUS Status; EFI_STATUS Status;
EFI_STATUS_CODE_DATA *StatusCodeData; EFI_STATUS_CODE_DATA *StatusCodeData;
EFI_TPL Tpl;
UINT64 Buffer[EFI_STATUS_CODE_DATA_MAX_SIZE / sizeof (UINT64)];
ASSERT (!((ExtendedData == NULL) && (ExtendedDataSize != 0))); ASSERT (!((ExtendedData == NULL) && (ExtendedDataSize != 0)));
ASSERT (!((ExtendedData != NULL) && (ExtendedDataSize == 0))); ASSERT (!((ExtendedData != NULL) && (ExtendedDataSize == 0)));
@ -495,14 +497,34 @@ ReportStatusCodeEx (
return EFI_UNSUPPORTED; return EFI_UNSUPPORTED;
} }
//
// Retrieve the current TPL
//
Tpl = gBS->RaiseTPL (TPL_HIGH_LEVEL);
gBS->RestoreTPL (Tpl);
StatusCodeData = NULL;
if (Tpl <= TPL_NOTIFY) {
// //
// Allocate space for the Status Code Header and its buffer // Allocate space for the Status Code Header and its buffer
// //
StatusCodeData = NULL;
gBS->AllocatePool (EfiBootServicesData, sizeof (EFI_STATUS_CODE_DATA) + ExtendedDataSize, (VOID **)&StatusCodeData); gBS->AllocatePool (EfiBootServicesData, sizeof (EFI_STATUS_CODE_DATA) + ExtendedDataSize, (VOID **)&StatusCodeData);
}
if (StatusCodeData == NULL) { if (StatusCodeData == NULL) {
//
// If a buffer could not be allocated, then see if the local variable Buffer can be used
//
if (ExtendedDataSize > (EFI_STATUS_CODE_DATA_MAX_SIZE - sizeof (EFI_STATUS_CODE_DATA))) {
//
// The local variable Buffer not large enough to hold the extended data associated
// with the status code being reported.
//
ASSERT (FALSE);
return EFI_OUT_OF_RESOURCES; return EFI_OUT_OF_RESOURCES;
} }
StatusCodeData = (EFI_STATUS_CODE_DATA *)Buffer;
}
// //
// Fill in the extended data header // Fill in the extended data header
@ -532,7 +554,9 @@ ReportStatusCodeEx (
// //
// Free the allocated buffer // Free the allocated buffer
// //
if (StatusCodeData != (EFI_STATUS_CODE_DATA *)Buffer) {
gBS->FreePool (StatusCodeData); gBS->FreePool (StatusCodeData);
}
return Status; return Status;
} }