diff options
| -rw-r--r-- | Kernel/Heap/kmalloc.cpp | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/Kernel/Heap/kmalloc.cpp b/Kernel/Heap/kmalloc.cpp index a26923b4c1..71aacb04f1 100644 --- a/Kernel/Heap/kmalloc.cpp +++ b/Kernel/Heap/kmalloc.cpp @@ -186,6 +186,7 @@ struct KmallocGlobalData { void deallocate(void* ptr, size_t size) { VERIFY(!expansion_in_progress); + VERIFY(is_valid_kmalloc_address(VirtualAddress { ptr })); for (auto& slabheap : slabheaps) { if (size <= slabheap.slab_size()) @@ -298,6 +299,17 @@ struct KmallocGlobalData { }; Optional<ExpansionData> expansion_data; + bool is_valid_kmalloc_address(VirtualAddress vaddr) const + { + if (vaddr.as_ptr() >= initial_kmalloc_memory && vaddr.as_ptr() < (initial_kmalloc_memory + INITIAL_KMALLOC_MEMORY_SIZE)) + return true; + + if (!expansion_data.has_value()) + return false; + + return expansion_data->virtual_range.contains(vaddr); + } + KmallocSubheap::List subheaps; KmallocSlabheap slabheaps[6] = { 16, 32, 64, 128, 256, 512 }; |