Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

boot/efi/mmu: fix sign extension issues

Browse Source 
Conversion from pointer to phys_addr_t (i.e. uint64) results
in a sign extension on x86.

Therefore we first convert to addr_t and then convert from
addr_t to phys_addr_t.

Change-Id: Id9d9db03d9940a11ea3892841c271e12fad3975a
Reviewed-on: https://review.haiku-os.org/c/haiku/+/4872
Tested-by: Commit checker robot <no-reply+buildbot@haiku-os.org>
Reviewed-by: Fredrik Holmqvist <fredrik.holmqvist@gmail.com>
Reviewed-by: Adrien Destugues <pulkomandy@gmail.com>
Reviewed-by: Alex von Gluck IV <kallisti5@unixzen.com>
This commit is contained in:
David Karoly 2022-01-18 16:35:27 +01:00 committed by Alex von Gluck IV
parent 8b35436293
commit bfd5d56283
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/system/boot/platform/efi/mmu.cpp
View File

@ -242,7 +242,8 @@ platform_bootloader_address_to_kernel_address(void *address, addr_t *_result)
// Convert any physical ranges prior to looking up address
convert_physical_ranges();
phys_addr_t addr = (phys_addr_t)address;
// Double cast needed to avoid sign extension issues on 32-bit architecture
phys_addr_t addr = (phys_addr_t)(addr_t)address;
for (memory_region *region = allocated_regions; region;
region = region->next) {
@ -290,9 +291,12 @@ platform_free_region(void *address, size_t size)
for (memory_region **ref = &allocated_regions; *ref;
ref = &(*ref)->next) {
if ((*ref)->matches((phys_addr_t)address, size)) {
kBootServices->FreePages((efi_physical_addr)address,
// Double cast needed to avoid sign extension issues on 32-bit architecture
if ((*ref)->matches((phys_addr_t)(addr_t)address, size)) {
efi_status status;
status = kBootServices->FreePages((efi_physical_addr)(addr_t)address,
ROUNDUP(size, B_PAGE_SIZE) / B_PAGE_SIZE);
ASSERT_ALWAYS(status == EFI_SUCCESS);
memory_region* old = *ref;
//pointer to current allocated_memory_region* now points to next
*ref = (*ref)->next;