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

lib/os/heap: make some checks more assertive

Browse source 
Some checks in sys_heap_init() depend on the externally provided size
parameter. If the check fails, this would be a bug outside of the heap
code and therefore should be flagged despite the value of
CONFIG_SYS_HEAP_VALIDATE.

Signed-off-by: Nicolas Pitre <npitre@baylibre.com>
This commit is contained in:
Nicolas Pitre 2020-06-25 15:01:09 -04:00 committed by Andrew Boie
parent 3c55e1fcf3
commit 0ae04f01b6
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
lib/os/heap.c
View file

@ -308,10 +308,10 @@ void *sys_heap_aligned_alloc(struct sys_heap *heap, size_t align, size_t bytes)
void sys_heap_init(struct sys_heap *heap, void *mem, size_t bytes)
{
/* Must fit in a 32 bit count of HUNK_UNIT */
CHECK(bytes / CHUNK_UNIT <= 0xffffffffU);
__ASSERT(bytes / CHUNK_UNIT <= 0xffffffffU, "heap size is too big");
/* Reserve the final marker chunk's header */
CHECK(bytes > heap_footer_bytes(bytes));
__ASSERT(bytes > heap_footer_bytes(bytes), "heap size is too small");
bytes -= heap_footer_bytes(bytes);
/* Round the start up, the end down */
@ -320,7 +320,7 @@ void sys_heap_init(struct sys_heap *heap, void *mem, size_t bytes)
size_t buf_sz = (end - addr) / CHUNK_UNIT;
CHECK(end > addr);
CHECK(buf_sz > chunksz(sizeof(struct z_heap)));
__ASSERT(buf_sz > chunksz(sizeof(struct z_heap)), "heap size is too small");
struct z_heap *h = (struct z_heap *)addr;
heap->heap = h;
@ -332,7 +332,7 @@ void sys_heap_init(struct sys_heap *heap, void *mem, size_t bytes)
size_t chunk0_size = chunksz(sizeof(struct z_heap) +
nb_buckets * sizeof(struct z_heap_bucket));
CHECK(chunk0_size + min_chunk_size(h) < buf_sz);
__ASSERT(chunk0_size + min_chunk_size(h) < buf_sz, "heap size is too small");
for (int i = 0; i < nb_buckets; i++) {
h->buckets[i].next = 0;