xt-sys/exectos
3
5
Fork 2
Code Issues 7 Pull Requests 1 Actions Projects 1 Releases Wiki Activity

Fix physical address limit checks
All checks were successful
Builds / ExectOS (amd64, debug) (push) Successful in 30s
Details
Builds / ExectOS (amd64, release) (push) Successful in 28s
Details
Builds / ExectOS (i686, release) (push) Successful in 38s
Details
Builds / ExectOS (i686, debug) (push) Successful in 40s
Details

Browse Source
This commit is contained in:
Aiken Harris
2026-02-01 11:11:59 +01:00
parent ba4ac6cec8
commit 7f0341bb83
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
boot/xtldr/memory.cc
View File

@@ -376,14 +376,14 @@ Memory::MapEfiMemory(IN OUT PXTBL_PAGE_MAPPING PageMap,
else if(PageMap->PageMapLevel == 3) else if(PageMap->PageMapLevel == 3)
{ {
/* Limit physical address to 64GB in PAE mode */ /* Limit physical address to 64GB in PAE mode */
MaxAddress = 0xFFFFFFFFF; MaxAddress = 0xFFFFFFFFFULL;
} }
/* Check page map level */ /* Check page map level */
if(PageMap->PageMapLevel == 2 || PageMap->PageMapLevel == 3) if(PageMap->PageMapLevel == 2 || PageMap->PageMapLevel == 3)
{ {
/* Check if physical address starts beyond limit */ /* Check if physical address starts beyond limit */
if(Descriptor->PhysicalStart > MaxAddress) if(Descriptor->PhysicalStart >= MaxAddress)
{ {
/* Go to the next descriptor */ /* Go to the next descriptor */
Descriptor = (PEFI_MEMORY_DESCRIPTOR)((PUCHAR)Descriptor + MemoryMap->DescriptorSize); Descriptor = (PEFI_MEMORY_DESCRIPTOR)((PUCHAR)Descriptor + MemoryMap->DescriptorSize);
@@ -394,7 +394,7 @@ Memory::MapEfiMemory(IN OUT PXTBL_PAGE_MAPPING PageMap,
if(Descriptor->PhysicalStart + (Descriptor->NumberOfPages << EFI_PAGE_SHIFT) > MaxAddress) if(Descriptor->PhysicalStart + (Descriptor->NumberOfPages << EFI_PAGE_SHIFT) > MaxAddress)
{ {
/* Truncate memory descriptor to the lowest supported physical page */ /* Truncate memory descriptor to the lowest supported physical page */
Descriptor->NumberOfPages = (((ULONGLONG)MaxAddress) - Descriptor->PhysicalStart) >> EFI_PAGE_SHIFT; Descriptor->NumberOfPages = (MaxAddress - Descriptor->PhysicalStart) >> EFI_PAGE_SHIFT;
} }
} }