Mirrors/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2026-09-22 13:01:16 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'fix/kasan_heap_alignment' into 'master'

Browse Source 
fix(heap): preserve aligned allocation with KASAN

See merge request espressif/esp-idf!51186
This commit is contained in:
Alexey Lapshin
2026-08-06 14:06:58 +04:00
parent 4d9524b308 2c0ecc64fa
commit 366ce3ebed
3 changed files with 48 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
tools/test_apps/system/kasan_test/main/kasan_test_main.c
View File

@@ -15,10 +15,12 @@
*/
#include <stdio.h>
#include <stdint.h>
#include <string.h>
#include <stdlib.h>
#include "sdkconfig.h"
#include "unity.h"
#include "esp_heap_caps.h"
#include "esp_log.h"
#include "esp_kasan.h"
@@ -139,6 +141,34 @@ TEST_CASE("no false positive", "[kasan]")
ESP_LOGI(TAG, "no-bug test PASSED");
}
/* ---------------------------------------------------------------------- */
TEST_CASE("aligned allocation preserves alignment", "[kasan][heap]")
{
static const size_t alignments[] = { 8, 16, 32, 64 };
const uint32_t alloc_size = 37;
#if CONFIG_KASAN_NO_HALT
kasan_reset_error_count();
#endif
for (size_t i = 0; i < sizeof(alignments) / sizeof(alignments[0]); i++) {
const size_t alignment = alignments[i];
uint8_t *buf = heap_caps_aligned_alloc(alignment, alloc_size, MALLOC_CAP_DEFAULT);
TEST_ASSERT_NOT_NULL(buf);
TEST_ASSERT_EQUAL_UINT32(0, (uintptr_t)buf & (alignment - 1));
/* Verify the full user region remains accessible after the KASAN redzone offset. */
memset(buf, 0xA5, alloc_size);
heap_caps_free(buf);
}
#if CONFIG_KASAN_NO_HALT
TEST_ASSERT_EQUAL_UINT32(0, kasan_get_error_count());
#endif
ESP_LOGI(TAG, "aligned allocation test PASSED");
}
/* ---------------------------------------------------------------------- */
/*
* GCC -fsanitize=kernel-address instrumentation calls a sized family of

10
tools/test_apps/system/kasan_test/pytest_kasan.py
View File

@@ -93,6 +93,16 @@ def test_kasan_halt_no_false_positive(dut: Dut) -> None:
dut.expect('no-bug test PASSED', timeout=15)
@pytest.mark.generic
@idf_parametrize('target', ['supported_targets', 'preview_targets'], indirect=['target'])
@pytest.mark.parametrize('config', ['halt'], indirect=True)
def test_kasan_halt_aligned_alloc(dut: Dut) -> None:
"""KASAN redzones must not change aligned allocator guarantees."""
dut.expect('KASAN test application starting', timeout=15)
dut.write('"aligned allocation preserves alignment"')
dut.expect('aligned allocation test PASSED', timeout=15)
@pytest.mark.generic
@idf_parametrize('target', ['supported_targets', 'preview_targets'], indirect=['target'])
@pytest.mark.parametrize('config', ['halt'], indirect=True)