i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bootloader: ARM: Fix mmu_free()

Browse Source 
Allocation size was mixed up with page counts...
Allow freeing up to sNextVirtualAddress.
This commit is contained in:
François Revol
2013-10-26 20:54:00 +02:00
parent 9703c9cc30
commit 18041782fd
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/system/boot/arch/arm/arch_mmu.cpp
+5 -5
View File
@@ -513,18 +513,18 @@ mmu_free(void *virtualAddress, size_t size)
TRACE(("mmu_free(virtualAddress = %p, size: %ld)\n", virtualAddress, size)); TRACE(("mmu_free(virtualAddress = %p, size: %ld)\n", virtualAddress, size));
addr_t address = (addr_t)virtualAddress; addr_t address = (addr_t)virtualAddress;
size = (size + B_PAGE_SIZE - 1) / B_PAGE_SIZE; addr_t pageOffset = address % B_PAGE_SIZE;
// get number of pages to map address -= pageOffset;
size = (size + pageOffset + B_PAGE_SIZE - 1) / B_PAGE_SIZE * B_PAGE_SIZE;
// is the address within the valid range? // is the address within the valid range?
if (address < KERNEL_BASE if (address < KERNEL_LOAD_BASE || address + size > sNextVirtualAddress) {
|| address + size >= KERNEL_BASE + kMaxKernelSize) {
panic("mmu_free: asked to unmap out of range region (%p, size %lx)\n", panic("mmu_free: asked to unmap out of range region (%p, size %lx)\n",
(void *)address, size); (void *)address, size);
} }
// unmap all pages within the range // unmap all pages within the range
for (uint32 i = 0; i < size; i++) { for (size_t i = 0; i < size; i += B_PAGE_SIZE) {
unmap_page(address); unmap_page(address);
address += B_PAGE_SIZE; address += B_PAGE_SIZE;
} }