ExternalVendorCode/genode
1
0
Fork 0
mirror of https://github.com/genodelabs/genode.git synced 2025-02-20 17:52:52 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

base: check for used blocks in Allocator_avl

Browse Source 
The check is required for alloc_addr() as the desired range may already
be backed by a used block.
This commit is contained in:
Christian Helmuth 2022-10-20 17:02:50 +02:00
parent 4dee72a487
commit df4c4d5be2
1 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
repos/base/src/lib/base/allocator_avl.cc
View File

@ -322,7 +322,7 @@ Allocator_avl_base::_allocate(size_t const size, unsigned align, Range range,
Block *b_ptr = _addr_tree.first();
b_ptr = b_ptr ? search_fn(*b_ptr) : 0;
if (!b_ptr) {
if (!b_ptr || b_ptr->used()) {
/* range conflict */
_md_alloc.free(two_blocks.b1_ptr, sizeof(Block));
_md_alloc.free(two_blocks.b2_ptr, sizeof(Block));
@ -362,10 +362,6 @@ Allocator_avl_base::alloc_aligned(size_t size, unsigned align, Range range)
Range_allocator::Alloc_result Allocator_avl_base::alloc_addr(size_t size, addr_t addr)
{
/* check for integer overflow */
if (addr + size - 1 < addr)
return Alloc_error::DENIED;
/* check for range conflict */
if (!_sum_in_range(addr, size))
return Alloc_error::DENIED;