espressif/esp-idf
1
0
Fork 1
mirror of https://github.com/espressif/esp-idf.git synced 2025-07-31 03:07:21 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'bugfix/memprot_bad_esp_restart_check_v4.3_3' into 'release/v4.3'

Browse Source 
System/Security: wrong check of the Memprot feature in esp_restart()/panic_restart() (v4.3)

See merge request espressif/esp-idf!15424
This commit is contained in:
Mahavir Jain
2021-10-10 13:01:23 +00:00
parent d3ec2dc904 ec6745a137
commit c990c8f752
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
components/esp_system/port/panic_handler.c
View File

@ -228,7 +228,7 @@ void __attribute__((noreturn)) panic_restart(void)
digital_reset_needed = true; digital_reset_needed = true;
} }
#endif #endif
#if CONFIG_ESP_SYSTEM_CONFIG_MEMPROT_FEATURE #if CONFIG_ESP_SYSTEM_MEMPROT_FEATURE
if (esp_memprot_is_intr_ena_any() || esp_memprot_is_locked_any()) { if (esp_memprot_is_intr_ena_any() || esp_memprot_is_locked_any()) {
digital_reset_needed = true; digital_reset_needed = true;
} }

2
components/esp_system/system_api.c
View File

@ -76,7 +76,7 @@ void IRAM_ATTR esp_restart(void)
vTaskSuspendAll(); vTaskSuspendAll();
bool digital_reset_needed = false; bool digital_reset_needed = false;
#if CONFIG_ESP_SYSTEM_CONFIG_MEMPROT_FEATURE #if CONFIG_ESP_SYSTEM_MEMPROT_FEATURE
if (esp_memprot_is_intr_ena_any() || esp_memprot_is_locked_any()) { if (esp_memprot_is_intr_ena_any() || esp_memprot_is_locked_any()) {
digital_reset_needed = true; digital_reset_needed = true;
} }