espressif/ESP8266_RTOS_SDK
1
0
Fork 0
mirror of https://github.com/espressif/ESP8266_RTOS_SDK.git synced 2025-07-15 08:32:42 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(heap): Add integer overflow checks

Browse Source
This commit is contained in:
Dong Heng
2021-01-20 14:52:17 +08:00
parent d3bae6f93f
commit b9b4d8d7da
2 changed files with 16 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
components/heap/port/esp8266/include/priv/esp_heap_caps_priv.h
View File

@ -21,6 +21,8 @@
extern "C" { extern "C" {
#endif #endif
#define HEAP_MAX_SIZE (96 * 1024)
#define MEM_BLK_TAG 0x80000000 ///< Mark the memory block used #define MEM_BLK_TAG 0x80000000 ///< Mark the memory block used
#ifdef CONFIG_HEAP_TRACING #ifdef CONFIG_HEAP_TRACING

16
components/heap/src/esp_heap_caps.c
View File

@ -101,6 +101,11 @@ void IRAM_ATTR *_heap_caps_malloc(size_t size, uint32_t caps, const char *file,
uint32_t num; uint32_t num;
uint32_t mem_blk_size; uint32_t mem_blk_size;
if (size > (HEAP_MAX_SIZE - sizeof(mem2_blk_t) * 2)) {
ESP_EARLY_LOGV(TAG, "size=%u is oveflow", size);
return NULL;
}
if (line == 0) { if (line == 0) {
ESP_EARLY_LOGV(TAG, "caller func %p", file); ESP_EARLY_LOGV(TAG, "caller func %p", file);
} else { } else {
@ -297,9 +302,16 @@ void IRAM_ATTR _heap_caps_free(void *ptr, const char *file, size_t line)
*/ */
void *_heap_caps_calloc(size_t count, size_t size, uint32_t caps, const char *file, size_t line) void *_heap_caps_calloc(size_t count, size_t size, uint32_t caps, const char *file, size_t line)
{ {
void *p = _heap_caps_malloc(count * size, caps, file, line); size_t size_bytes;
if (__builtin_mul_overflow(count, size, &size_bytes)) {
ESP_EARLY_LOGV(TAG, "count=%u size=%u is oveflow", count, size);
return NULL;
}
void *p = _heap_caps_malloc(size_bytes, caps, file, line);
if (p) if (p)
memset(p, 0, count * size); memset(p, 0, size_bytes);
return p; return p;
} }