REF: https://bugzilla.tianocore.org/show_bug.cgi?id=1277
The failure is caused by data type conversion between UINTN and UINT64,
which is checked in at 63ebde8ef6d4ff497d054ccc010904ecd4441198.
Cc: Star Zeng <star.z...@intel.com>
Cc: Liming Gao <liming....@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Jian J Wang <jian.j.w...@intel.com>
---
MdeModulePkg/Core/Dxe/Mem/HeapGuard.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/MdeModulePkg/Core/Dxe/Mem/HeapGuard.c
b/MdeModulePkg/Core/Dxe/Mem/HeapGuard.c
index 449a022658..521e0d7b2a 100644
--- a/MdeModulePkg/Core/Dxe/Mem/HeapGuard.c
+++ b/MdeModulePkg/Core/Dxe/Mem/HeapGuard.c
@@ -463,7 +463,7 @@ IsGuardPage (
IN EFI_PHYSICAL_ADDRESS Address
)
{
- UINTN BitMap;
+ UINT64 BitMap;
//
// There must be at least one guarded page before and/or after given
@@ -1368,7 +1368,7 @@ GuardAllFreedPages (
UINT64 Address;
UINT64 GuardPage;
INTN Level;
- UINTN BitIndex;
+ UINT64 BitIndex;
UINTN GuardPageNumber;
if (mGuardedMemoryMap == 0 ||
@@ -1475,12 +1475,12 @@ MergeGuardPages (
}
Bitmap = 0;
- Pages = EFI_SIZE_TO_PAGES (MaxAddress - MemoryMapEntry->PhysicalStart);
- Pages -= MemoryMapEntry->NumberOfPages;
+ Pages = EFI_SIZE_TO_PAGES ((UINTN)(MaxAddress -
MemoryMapEntry->PhysicalStart));
+ Pages -= (INTN)MemoryMapEntry->NumberOfPages;
while (Pages > 0) {
if (Bitmap == 0) {
EndAddress = MemoryMapEntry->PhysicalStart +
- EFI_PAGES_TO_SIZE (MemoryMapEntry->NumberOfPages);
+ EFI_PAGES_TO_SIZE ((UINTN)MemoryMapEntry->NumberOfPages);
Bitmap = GetGuardedMemoryBits (EndAddress, GUARDED_HEAP_MAP_ENTRY_BITS);
}
--
2.19.0.windows.1
_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel
