[kernel] fix calloc overflow

This commit is contained in:
luchenxu authored and Rbb666 committed 2026-10-14 09:28:14 +08:00
1 parent 2486e7b47e
commit 517eecbe4a
3 files changed
+57 -3

No files matched your search

+9
View File
@@ -108,6 +108,15 @@ extern "C" {
#define RT_UINT64_MAX 0xFFFFFFFFFFFFFFFFULL /**< Maximum number of UINT64 */
#endif /* RT_USING_LIBC */
/* maximum value of rt_size_t */
#if defined(RT_USING_LIBC) && !defined(RT_USING_NANO)
#define RT_SIZE_MAX SIZE_MAX
#elif defined(ARCH_CPU_64BIT)
#define RT_SIZE_MAX RT_UINT64_MAX
#else
#define RT_SIZE_MAX RT_UINT32_MAX
#endif
#define RT_TICK_MAX RT_UINT32_MAX /**< Maximum number of tick */
/* maximum value of ipc type */
+10 -2
View File
@@ -1210,13 +1210,21 @@ RTM_EXPORT(rt_realloc);
rt_weak void *rt_calloc(rt_size_t count, rt_size_t size)
{
void *p;
rt_size_t total_size;
if (size != 0 && count > RT_SIZE_MAX / size)
{
return RT_NULL;
}
total_size = count * size;
/* allocate 'count' objects of size 'size' */
p = rt_malloc(count * size);
p = rt_malloc(total_size);
/* zero the memory */
if (p)
{
rt_memset(p, 0, count * size);
rt_memset(p, 0, total_size);
}
return p;
}
+38 -1
View File
@@ -14,7 +14,7 @@
*
* Test Objectives:
* - Validates the core kernel small memory management module functionality
* - Verify core APIs: rt_smem_init, rt_smem_alloc, rt_smem_free, rt_smem_realloc, rt_smem_detach
* - Verify core APIs: rt_smem_init, rt_smem_alloc, rt_smem_free, rt_smem_realloc, rt_smem_detach, rt_calloc
*
* Test Scenarios:
* - **Scenario 1 (Functional Test / mem_functional_test):**
@@ -37,6 +37,9 @@
* 3. Memory exhaustion handling: random freeing of other blocks when realloc fails
* 4. Reallocation to zero size (free operation) verification
* 5. Memory content integrity verification before and after reallocation
* - **Scenario 4 (Calloc Overflow Test / calloc_overflow_test):**
* 1. Reject an object count and size whose product wraps to a small allocation
* 2. Verify a normal allocation is zero-initialized
*
* Verification Metrics:
* - **Pass (Scenario 1):** All allocation operations return non-NULL pointers
@@ -53,6 +56,7 @@
* - **Pass (Scenario 3):** Realloc operations preserve existing data when size increases or decreases
* - **Pass (Scenario 3):** Magic number patterns maintained correctly after reallocation
* - **Pass (Scenario 3):** Realloc to zero size properly frees memory blocks
* - **Pass (Scenario 4):** Overflow returns NULL and normal allocation is zero-initialized
*
* Dependencies:
* - No specific hardware requirements, runs on any RT-Thread supported platform
@@ -60,6 +64,7 @@
* - `RT_USING_UTEST` must be enabled (`RT-Thread Utestcases`).
* - `Memory Test` must be enabled (`RT-Thread Utestcases` -> `Kernel Core` -> 'Memory Test').
* - RT-Thread kernel with small memory management enabled
* - Calloc overflow test requires RT_USING_HEAP without RT_USING_USERHEAP
* - rt_malloc and rt_free functions available for test buffer allocation
* - RT_ALIGN_SIZE macro defined for memory alignment
* - Random number generator (rand function) available for stress tests
@@ -637,6 +642,35 @@ static void mem_realloc_test(void)
rt_free(buf);
}
#if defined(RT_USING_HEAP) && !defined(RT_USING_USERHEAP)
static void calloc_overflow_test(void)
{
rt_size_t count = RT_SIZE_MAX / 2 + 2;
rt_uint8_t *ptr;
rt_size_t i;
ptr = rt_calloc(count, 2);
uassert_null(ptr);
if (ptr != RT_NULL)
{
rt_free(ptr);
}
ptr = rt_calloc(4, 8);
uassert_not_null(ptr);
if (ptr == RT_NULL)
{
return;
}
for (i = 0; i < 32; i++)
{
uassert_int_equal(ptr[i], 0);
}
rt_free(ptr);
}
#endif /* defined(RT_USING_HEAP) && !defined(RT_USING_USERHEAP) */
static rt_err_t utest_tc_init(void)
{
return RT_EOK;
@@ -652,5 +686,8 @@ static void testcase(void)
UTEST_UNIT_RUN(mem_functional_test);
UTEST_UNIT_RUN(mem_alloc_test);
UTEST_UNIT_RUN(mem_realloc_test);
#if defined(RT_USING_HEAP) && !defined(RT_USING_USERHEAP)
UTEST_UNIT_RUN(calloc_overflow_test);
#endif /* defined(RT_USING_HEAP) && !defined(RT_USING_USERHEAP) */
}
UTEST_TC_EXPORT(testcase, "core.mem", utest_tc_init, utest_tc_cleanup, 20);