wash/photon
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed incorrect heap bounds

Browse Source
This commit is contained in:
Max Wash
2021-03-11 10:12:33 +00:00
parent ad355938a5
commit 28071cd3c6
1 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
photon/libc/sys/magenta/heap.c
View File

@@ -14,19 +14,20 @@ static uintptr_t heap_alloc_point = 0;
static size_t heap_sz = 0; static size_t heap_sz = 0;
static mx_handle_t heap_vmo = MX_NULL_HANDLE; static mx_handle_t heap_vmo = MX_NULL_HANDLE;
void __crt_heap_init(size_t heap_sz) void __crt_heap_init(size_t sz)
{ {
mx_status_t status = mx_vmo_create( mx_status_t status = mx_vmo_create(
heap_sz, sz,
MX_VM_CAN_MAP_READ | MX_VM_CAN_MAP_WRITE | MX_VM_CAN_MAP_SPECIFIC, MX_VM_CAN_MAP_READ | MX_VM_CAN_MAP_WRITE | MX_VM_CAN_MAP_SPECIFIC,
&heap_vmo); &heap_vmo);
mx_vaddr_t heap = 0; mx_vaddr_t heap = 0;
mx_vmar_map(mx_get_startup_handle(MX_B_VMAR_ROOT), mx_vmar_map(mx_get_startup_handle(MX_B_VMAR_ROOT),
MX_VM_PERM_READ | MX_VM_PERM_WRITE, MX_VM_PERM_READ | MX_VM_PERM_WRITE,
0, heap_vmo, 0, heap_sz, 0, heap_vmo, 0, sz,
&heap); &heap);
heap_sz = sz;
heap_start = heap; heap_start = heap;
heap_end = heap + heap_sz; heap_end = heap + heap_sz;
heap_alloc_point = heap_start; heap_alloc_point = heap_start;
@@ -41,20 +42,20 @@ void *__crt_heap_extend(size_t sz)
sz += MX_PAGE_SIZE; sz += MX_PAGE_SIZE;
} }
if (!sz) {
return (void *)heap_end;
}
if (!heap_start) { if (!heap_start) {
__crt_heap_init(sz); __crt_heap_init(sz);
return (void *)heap_start; return (void *)heap_start;
} }
if (!sz) {
return (void *)heap_end;
}
mx_vmo_set_size(heap_vmo, heap_sz + sz); mx_vmo_set_size(heap_vmo, heap_sz + sz);
mx_vaddr_t vmar_base, alloc_base; mx_vaddr_t vmar_base, alloc_base;
mx_vmar_bounds(mx_get_startup_handle(MX_B_VMAR_ROOT), &vmar_base, NULL); mx_vmar_bounds(mx_get_startup_handle(MX_B_VMAR_ROOT), &vmar_base, NULL);
mx_vaddr_t offset = heap_end - vmar_base; size_t offset = heap_end - vmar_base;
mx_vmar_map(mx_get_startup_handle(MX_B_VMAR_ROOT), mx_vmar_map(mx_get_startup_handle(MX_B_VMAR_ROOT),
MX_VM_PERM_READ | MX_VM_PERM_WRITE | MX_VM_SPECIFIC, MX_VM_PERM_READ | MX_VM_PERM_WRITE | MX_VM_SPECIFIC,