1 files changed, 28 insertions, 4 deletions
diff --git a/IntelFrameworkModulePkg/Library/DxeReportStatusCodeLibFramework/ReportStatusCodeLib.c b/IntelFrameworkModulePkg/Library/DxeReportStatusCodeLibFramework/ReportStatusCodeLib.c
index cf1f74c26c..af788cd4c9 100644
--- a/IntelFrameworkModulePkg/Library/DxeReportStatusCodeLibFramework/ReportStatusCodeLib.c
+++ b/IntelFrameworkModulePkg/Library/DxeReportStatusCodeLibFramework/ReportStatusCodeLib.c
@@ -487,6 +487,8 @@ ReportStatusCodeEx (
 {
   EFI_STATUS            Status;
   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)));
@@ -496,12 +498,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;
-  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) {
-    return EFI_OUT_OF_RESOURCES;
+    //
+    // 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;
+    }
+    StatusCodeData = (EFI_STATUS_CODE_DATA  *)Buffer;
   }
 
   //
@@ -532,7 +554,9 @@ ReportStatusCodeEx (
   //
   // Free the allocated buffer
   //
-  gBS->FreePool (StatusCodeData);
+  if (StatusCodeData != (EFI_STATUS_CODE_DATA  *)Buffer) {
+    gBS->FreePool (StatusCodeData);
+  }
 
   return Status;
 }