blackbeard420/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf synced 2025-04-01 12:20:11 -04:00
Code Issues Projects Releases Wiki Activity

fix(bt): Fix heap corruption in the call of esp_bt_mem_release on ESP32

Browse Source 
Closes https://github.com/espressif/esp-idf/issues/14263
This commit is contained in:
Wang Mengyang 2024-07-30 17:17:18 +08:00 committed by BOT
parent 3de27ba7b2
commit f4eef0a5fb
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
components/bt/controller/esp32/bt.c
View File

@ -1432,6 +1432,14 @@ esp_err_t esp_bt_mem_release(esp_bt_mode_t mode)
.name = "BT Controller Data" .name = "BT Controller Data"
}; };
/*
* Free data and BSS section for Bluetooth controller ROM code.
* Note that rom mem release must be performed before section _bt_data_start to _bt_data_end is released,
* otherwise `btdm_dram_available_region` will no longer be available when performing rom mem release and
* thus causing heap corruption.
*/
ret = esp_bt_controller_rom_mem_release(mode);
if (mode == ESP_BT_MODE_BTDM) { if (mode == ESP_BT_MODE_BTDM) {
/* Start by freeing Bluetooth BSS section */ /* Start by freeing Bluetooth BSS section */
if (ret == ESP_OK) { if (ret == ESP_OK) {
@ -1444,11 +1452,6 @@ esp_err_t esp_bt_mem_release(esp_bt_mode_t mode)
} }
} }
/* free data and BSS section for Bluetooth controller ROM code */
if (ret == ESP_OK) {
ret = esp_bt_controller_rom_mem_release(mode);
}
return ret; return ret;
} }