patrick/zephyr
1
0
Fork 0
Code Issues Pull requests Actions 8 Packages Projects Releases Wiki Activity

mmu: fix virt_region_alloc() unused region free when aligned

Browse source 
In the case where the aligned memory range is on top of the allocated
memory range, freeing the 0 sized top unused memory will trigger
an assert in the virt_region_free() call since vaddr could be equal
to Z_VIRT_REGION_END_ADDR.

Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>
This commit is contained in:
Neil Armstrong 2021-10-12 14:36:30 +02:00 committed by Anas Nashif
parent 513d691dba
commit 2f359aeacf
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
kernel/mmu.c
View file

@ -313,8 +313,10 @@ static void *virt_region_alloc(size_t size, size_t align)
/* Free the two unused regions */ /* Free the two unused regions */
virt_region_free(UINT_TO_POINTER(dest_addr), virt_region_free(UINT_TO_POINTER(dest_addr),
aligned_dest_addr - dest_addr); aligned_dest_addr - dest_addr);
virt_region_free(UINT_TO_POINTER(aligned_dest_addr + size), if (((dest_addr + alloc_size) - (aligned_dest_addr + size)) > 0) {
(dest_addr + alloc_size) - (aligned_dest_addr + size)); virt_region_free(UINT_TO_POINTER(aligned_dest_addr + size),
(dest_addr + alloc_size) - (aligned_dest_addr + size));
}
dest_addr = aligned_dest_addr; dest_addr = aligned_dest_addr;
} }