feedc0de/esp-idf
1
0
Fork 0
forked from espressif/esp-idf
Code Pull Requests Activity

Merge branch 'bugfix/heap_corrupt_in_bt_mem_release_on_esp32_v5.0' into 'release/v5.0'

Browse Source 
fix(bt): Fix heap corruption in the call of esp_bt_mem_release on ESP32 (v5.0)

See merge request espressif/esp-idf!32804
This commit is contained in:
Jiang Jiang Jian
2024-08-15 16:10:34 +08:00
parent 0c829b34b7 a372e0ee88
commit b99f0f9b7a
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1484,6 +1484,14 @@ esp_err_t esp_bt_mem_release(esp_bt_mode_t mode)
.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) {
/* Start by freeing Bluetooth BSS section */
if (ret == ESP_OK) {
@@ -1496,11 +1504,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;
}