Skip to content

memheap内存管理算法漏洞修复 #5366

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
BernardXiong merged 2 commits into from
Dec 13, 2021
Merged

memheap内存管理算法漏洞修复 #5366

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
20ae7a6
[update] 使用memheap内存管理时，rt_malloc 0长度返回RT_NULL, 与slab与小内存管理等算法保持一致。
babboys Dec 12, 2021
199b734
[update] 使用memheap内存管理算法时，对rt_system_heap_init传入的地址进行对齐。
babboys Dec 12, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 10 additions & 3 deletions src/memheap.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -832,13 +832,16 @@ static struct rt_memheap _heap;
*/
void rt_system_heap_init(void *begin_addr, void *end_addr)
{
RT_ASSERT((rt_uint32_t)end_addr > (rt_uint32_t)begin_addr);
RT_ASSERT((rt_size_t)end_addr > (rt_size_t)begin_addr);

rt_size_t begin_align = RT_ALIGN((rt_size_t)begin_addr, RT_ALIGN_SIZE);
rt_size_t end_align = RT_ALIGN_DOWN((rt_size_t)end_addr, RT_ALIGN_SIZE);

/* initialize a default heap in the system */
rt_memheap_init(&_heap,
"heap",
begin_addr,
(rt_uint32_t)end_addr - (rt_uint32_t)begin_addr);
(void *)begin_align,
end_align - begin_align);
}

/**
Expand All @@ -850,6 +853,10 @@ void *rt_malloc(rt_size_t size)
{
void *ptr;

/* zero size, return RT_NULL */
if (size == 0)
return RT_NULL;

/* try to allocate in system heap */
ptr = rt_memheap_alloc(&_heap, size);
#ifdef RT_USING_MEMHEAP_AUTO_BINDING
Expand Down