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

1. Rollback the changing on replacing MAX_EXTENDED_DATA_SIZE by EFI_STATUS_CODE_DATA_MAX_SIZE,

Browse Source 
use MAX_EXTENDED_DATA_SIZE as before.
2. Use DEBUG error message instead of ASSERT(FASLE) when extended data is too large
3. Expand 1 for buffer array size to avoid potential issue.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@11083 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
vanjeff
2010-11-23 07:50:31 +00:00
parent da70d02589
commit 7b78853921
2 changed files with 17 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
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;
/** /**
@ -485,7 +491,7 @@ ReportStatusCodeEx (
EFI_STATUS Status; EFI_STATUS Status;
EFI_STATUS_CODE_DATA *StatusCodeData; EFI_STATUS_CODE_DATA *StatusCodeData;
EFI_TPL Tpl; EFI_TPL Tpl;
UINT64 Buffer[EFI_STATUS_CODE_DATA_MAX_SIZE / sizeof (UINT64)]; UINT64 Buffer[(MAX_EXTENDED_DATA_SIZE / sizeof (UINT64)) + 1];
ASSERT (!((ExtendedData == NULL) && (ExtendedDataSize != 0))); ASSERT (!((ExtendedData == NULL) && (ExtendedDataSize != 0)));
ASSERT (!((ExtendedData != NULL) && (ExtendedDataSize == 0))); ASSERT (!((ExtendedData != NULL) && (ExtendedDataSize == 0)));
@ -512,12 +518,12 @@ ReportStatusCodeEx (
// //
// If a buffer could not be allocated, then see if the local variable Buffer can be used // 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))) { if (ExtendedDataSize > (MAX_EXTENDED_DATA_SIZE - sizeof (EFI_STATUS_CODE_DATA))) {
// //
// The local variable Buffer not large enough to hold the extended data associated // The local variable Buffer not large enough to hold the extended data associated
// with the status code being reported. // with the status code being reported.
// //
ASSERT (FALSE); DEBUG ((EFI_D_ERROR, "Status code extended data is too large to be reported!\n"));
return EFI_OUT_OF_RESOURCES; return EFI_OUT_OF_RESOURCES;
} }
StatusCodeData = (EFI_STATUS_CODE_DATA *)Buffer; StatusCodeData = (EFI_STATUS_CODE_DATA *)Buffer;

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

@ -23,6 +23,11 @@
#include <Library/OemHookStatusCodeLib.h> #include <Library/OemHookStatusCodeLib.h>
#include <Library/PcdLib.h> #include <Library/PcdLib.h>
//
// Define the maximum extended data size that is supported in the PEI phase
//
#define MAX_EXTENDED_DATA_SIZE 0x200
/** /**
Internal worker function that reports a status code through the PEI Status Code Service or Internal worker function that reports a status code through the PEI Status Code Service or
OEM Hook Status Code Library. OEM Hook Status Code Library.
@ -453,7 +458,7 @@ ReportStatusCodeEx (
) )
{ {
EFI_STATUS_CODE_DATA *StatusCodeData; EFI_STATUS_CODE_DATA *StatusCodeData;
UINT64 Buffer[EFI_STATUS_CODE_DATA_MAX_SIZE / sizeof (UINT64)]; UINT64 Buffer[(MAX_EXTENDED_DATA_SIZE / sizeof (UINT64)) + 1];
// //
// If ExtendedData is NULL and ExtendedDataSize is not zero, then ASSERT(). // If ExtendedData is NULL and ExtendedDataSize is not zero, then ASSERT().
@ -464,12 +469,12 @@ ReportStatusCodeEx (
// //
ASSERT (!((ExtendedData != NULL) && (ExtendedDataSize == 0))); ASSERT (!((ExtendedData != NULL) && (ExtendedDataSize == 0)));
if (ExtendedDataSize > (EFI_STATUS_CODE_DATA_MAX_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 // The local variable Buffer not large enough to hold the extended data associated
// with the status code being reported. // with the status code being reported.
// //
ASSERT (FALSE); DEBUG ((EFI_D_ERROR, "Status code extended data is too large to be reported!\n"));
return EFI_OUT_OF_RESOURCES; return EFI_OUT_OF_RESOURCES;
} }
StatusCodeData = (EFI_STATUS_CODE_DATA *) Buffer; StatusCodeData = (EFI_STATUS_CODE_DATA *) Buffer;