alex/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2025-08-08 04:02:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'fix/stack-check-fail-in-flash' into 'master'

Browse Source 
esp_system: fix placement of __stack_chk_fail from flash to RAM

See merge request espressif/esp-idf!21465
This commit is contained in:
Guillaume Souchere
2022-12-09 18:08:57 +08:00
parent 374434524b 4d16f46a88
commit c92f2394f2
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
components/esp_system/stack_check.c
View File

@@ -23,10 +23,9 @@ __esp_stack_guard_setup (void)
__stack_chk_guard = (void *)esp_random(); __stack_chk_guard = (void *)esp_random();
} }
void __stack_chk_fail (void) IRAM_ATTR void __stack_chk_fail (void)
{ {
esp_rom_printf("\r\nStack smashing protect failure!\r\n\r\n"); esp_system_abort(DRAM_STR("Stack smashing protect failure!"));
abort();
} }
#endif #endif

3
components/heap/test_apps/sdkconfig.defaults
View File

@@ -1,3 +1,6 @@
CONFIG_COMPILER_DUMP_RTL_FILES=y CONFIG_COMPILER_DUMP_RTL_FILES=y
CONFIG_ESP_TASK_WDT_CHECK_IDLE_TASK_CPU0=n CONFIG_ESP_TASK_WDT_CHECK_IDLE_TASK_CPU0=n
CONFIG_ESP_SYSTEM_MEMPROT_FEATURE=n # memory protection needs to be disabled for certain tests CONFIG_ESP_SYSTEM_MEMPROT_FEATURE=n # memory protection needs to be disabled for certain tests
CONFIG_COMPILER_STACK_CHECK_MODE_ALL=y
CONFIG_COMPILER_STACK_CHECK=y