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@11003 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
mdkinney
2010-11-04 20:58:23 +00:00
parent 9be899c5cc
commit c5e0de8794
2 changed files with 39 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
MdeModulePkg/Library/DxeReportStatusCodeLib/ReportStatusCodeLib.c
View File

@ -25,6 +25,12 @@
#include <Guid/StatusCodeDataTypeId.h> #include <Guid/StatusCodeDataTypeId.h>
#include <Guid/StatusCodeDataTypeDebug.h> #include <Guid/StatusCodeDataTypeDebug.h>
//
// Define the maximum extended data size that is supported when a status code is
// reported at TPL_HIGH_LEVEL.
//
#define MAX_EXTENDED_DATA_SIZE 0x200
EFI_STATUS_CODE_PROTOCOL *mReportStatusCodeLibStatusCodeProtocol = NULL; EFI_STATUS_CODE_PROTOCOL *mReportStatusCodeLibStatusCodeProtocol = NULL;
/** /**
@ -484,6 +490,8 @@ ReportStatusCodeEx (
{ {
EFI_STATUS Status; EFI_STATUS Status;
EFI_STATUS_CODE_DATA *StatusCodeData; EFI_STATUS_CODE_DATA *StatusCodeData;
EFI_TPL Tpl;
UINT64 Buffer[MAX_EXTENDED_DATA_SIZE / sizeof (UINT64)];
ASSERT (!((ExtendedData == NULL) && (ExtendedDataSize != 0))); ASSERT (!((ExtendedData == NULL) && (ExtendedDataSize != 0)));
ASSERT (!((ExtendedData != NULL) && (ExtendedDataSize == 0))); ASSERT (!((ExtendedData != NULL) && (ExtendedDataSize == 0)));
@ -493,12 +501,32 @@ ReportStatusCodeEx (
} }
// //
// Allocate space for the Status Code Header and its buffer // Retrieve the current TPL
// //
Tpl = gBS->RaiseTPL (TPL_HIGH_LEVEL);
gBS->RestoreTPL (Tpl);
StatusCodeData = NULL; StatusCodeData = NULL;
gBS->AllocatePool (EfiBootServicesData, sizeof (EFI_STATUS_CODE_DATA) + ExtendedDataSize, (VOID **)&StatusCodeData); if (Tpl <= TPL_NOTIFY) {
//
// Allocate space for the Status Code Header and its buffer
//
gBS->AllocatePool (EfiBootServicesData, sizeof (EFI_STATUS_CODE_DATA) + ExtendedDataSize, (VOID **)&StatusCodeData);
}
if (StatusCodeData == NULL) { if (StatusCodeData == NULL) {
return EFI_OUT_OF_RESOURCES; //
// If a buffer could not be allocated, then see if the local variable Buffer can be used
//
if (ExtendedDataSize > (MAX_EXTENDED_DATA_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;
}
StatusCodeData = (EFI_STATUS_CODE_DATA *)Buffer;
} }
// //
@ -529,7 +557,9 @@ ReportStatusCodeEx (
// //
// Free the allocated buffer // Free the allocated buffer
// //
gBS->FreePool (StatusCodeData); if (StatusCodeData != (EFI_STATUS_CODE_DATA *)Buffer) {
gBS->FreePool (StatusCodeData);
}
return Status; return Status;
} }

5
MdeModulePkg/Library/PeiReportStatusCodeLib/ReportStatusCodeLib.c
View File

@ -470,6 +470,11 @@ ReportStatusCodeEx (
ASSERT (!((ExtendedData != NULL) && (ExtendedDataSize == 0))); ASSERT (!((ExtendedData != NULL) && (ExtendedDataSize == 0)));
if (ExtendedDataSize > (MAX_EXTENDED_DATA_SIZE - sizeof (EFI_STATUS_CODE_DATA))) { if (ExtendedDataSize > (MAX_EXTENDED_DATA_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; StatusCodeData = (EFI_STATUS_CODE_DATA *) Buffer;