mirrors/ladybird
0
0
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2025-09-03 16:16:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

Kernel: Fix heap expansion loop

Browse source 
By being a bit too greedy and only allocating how much we need for
the failing allocation, we can end up in an infinite loop trying
to expand the heap further. That's because there are other allocations
(e.g. logging, vmobjects, regions, ...) that happen before we finally
retry the failed allocation request.

Also fix allocating in page size increments, which lead to an assertion
when the heap had to grow more than the 1 MiB backup.
This commit is contained in:
Tom 2020-09-04 15:31:56 -06:00 • committed by Andreas Kling
commit 678bbd29ca
Notes: sideshowbarker 2024-07-19 02:49:16 +09:00
2 changed files with 18 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Kernel/Heap/Heap.h
View file

@ -257,6 +257,7 @@ public:
void* allocate(size_t size)
{
int attempt = 0;
do {
for (auto* subheap = &m_heaps; subheap; subheap = subheap->next) {
if (void* ptr = subheap->heap.allocate(size))
@ -269,6 +270,10 @@ public:
// This is especially true for the kmalloc heap, where adding memory
// requires several other objects to be allocated just to be able to
// expand the heap.
// To avoid an infinite expansion loop, limit to two attempts
if (attempt++ >= 2)
break;
} while (expand_memory(size));
return nullptr;
}