Rebuilt per the Hess's bug fixes

[mirror_edk2.git] / MdeModulePkg / Core / Pei / Memory / MemoryServices.c

diff --git a/MdeModulePkg/Core/Pei/Memory/MemoryServices.c b/MdeModulePkg/Core/Pei/Memory/MemoryServices.c
index e2b2ccc30f273a2a997705cb3c7862a476380643..05e65ce75e00aa8389cdb8e46bad02c9e4b51f25 100644 (file)
--- a/MdeModulePkg/Core/Pei/Memory/MemoryServices.c
+++ b/MdeModulePkg/Core/Pei/Memory/MemoryServices.c
@@ -115,16 +115,23 @@ Returns:
   UINT64                                EfiFreeMemorySize;\r
   EFI_PHYSICAL_ADDRESS                  PhysicalAddressOfOldHob;\r
 \r
+  if (MemoryLength > (MAX_ADDRESS - MemoryBegin + 1))\r
+    return EFI_INVALID_PARAMETER;\r
+    \r
+   \r
   DEBUG ((EFI_D_INFO, "PeiInstallPeiMemory MemoryBegin 0x%LX, MemoryLength 0x%LX\n", MemoryBegin, MemoryLength));\r
   \r
   PrivateData = PEI_CORE_INSTANCE_FROM_PS_THIS (PeiServices);\r
 \r
   PrivateData->SwitchStackSignal = TRUE;\r
   PrivateData->PeiMemoryInstalled = TRUE;\r
-\r
-  PrivateData->StackBase = MemoryBegin;\r
   \r
-  PeiStackSize = RShiftU64 (MemoryLength, 1);\r
+  //\r
+  // Ensure the stack base is in page alignment \r
+  //\r
+  PrivateData->StackBase = ((UINTN)MemoryBegin + EFI_PAGE_MASK) & ~EFI_PAGE_MASK;\r
+  PeiStackSize = (RShiftU64 (MemoryLength, 1) + EFI_PAGE_MASK) & ~EFI_PAGE_MASK;\r
+  \r
   if (PEI_STACK_SIZE > PeiStackSize) {\r
     PrivateData->StackSize = PeiStackSize;\r
   } else {\r
@@ -133,7 +140,7 @@ Returns:
 \r
   OldHandOffHob = PrivateData->HobList.HandoffInformationTable;\r
 \r
-  PrivateData->HobList.Raw = (VOID *)((UINTN)(MemoryBegin + PrivateData->StackSize));\r
+  PrivateData->HobList.Raw = (VOID *)((UINTN)(PrivateData->StackBase + PrivateData->StackSize));\r
   NewHandOffHob = PrivateData->HobList.HandoffInformationTable;\r
   PhysicalAddressOfOldHob = (EFI_PHYSICAL_ADDRESS) (UINTN) OldHandOffHob;\r
 \r