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

fix(sdmmc): Legacy driver slot deinit set NULL after free

Browse Source
This commit is contained in:
Adam Múdry
2025-06-26 13:59:56 +02:00
parent 68f9f0381a
commit 1ab7235b9e
1 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
components/esp_driver_sdmmc/legacy/src/sdmmc_host.c
View File

@@ -91,6 +91,11 @@ sd_host_slot_handle_t sdmmc_get_slot_handle(int slot_id)
return slot_id == 0 ? s_slot0 : s_slot1; return slot_id == 0 ? s_slot0 : s_slot1;
} }
static sd_host_slot_handle_t* sdmmc_get_slot_handle_ptr(int slot_id)
{
return slot_id == 0 ? &s_slot0 : &s_slot1;
}
esp_err_t sdmmc_host_is_slot_set_to_uhs1(int slot, bool *is_uhs1) esp_err_t sdmmc_host_is_slot_set_to_uhs1(int slot, bool *is_uhs1)
{ {
SLOT_CHECK(slot); SLOT_CHECK(slot);
@@ -145,8 +150,9 @@ esp_err_t sdmmc_host_init_slot(int slot, const sdmmc_slot_config_t *slot_config)
esp_err_t sdmmc_host_deinit_slot(int slot) esp_err_t sdmmc_host_deinit_slot(int slot)
{ {
esp_err_t ret = ESP_FAIL; esp_err_t ret = ESP_FAIL;
sd_host_slot_handle_t hdl = sdmmc_get_slot_handle(slot); sd_host_slot_handle_t* hdl = sdmmc_get_slot_handle_ptr(slot);
ESP_RETURN_ON_ERROR(sd_host_remove_slot(hdl), TAG, "failed to remove slot"); ESP_RETURN_ON_ERROR(sd_host_remove_slot(*hdl), TAG, "failed to remove slot");
*hdl = NULL;
ret = sd_host_del_controller(s_ctlr); ret = sd_host_del_controller(s_ctlr);
//for backward compatibility, return ESP_OK when only slot is removed and host is still there //for backward compatibility, return ESP_OK when only slot is removed and host is still there
@@ -160,11 +166,13 @@ esp_err_t sdmmc_host_deinit_slot(int slot)
esp_err_t sdmmc_host_deinit(void) esp_err_t sdmmc_host_deinit(void)
{ {
esp_err_t ret = ESP_FAIL; esp_err_t ret = ESP_FAIL;
sd_host_slot_handle_t hdl[2] = {s_slot0, s_slot1}; sd_host_slot_handle_t* hdl_ptrs[2] = {&s_slot0, &s_slot1};
for (int i = 0; i < 2; i++) { for (int i = 0; i < 2; i++) {
if (hdl[i]) { sd_host_slot_handle_t hdl = *hdl_ptrs[i];
ret = sd_host_remove_slot(hdl[i]); if (hdl) {
ret = sd_host_remove_slot(hdl);
ESP_RETURN_ON_ERROR(ret, TAG, "failed to remove slot%d", i); ESP_RETURN_ON_ERROR(ret, TAG, "failed to remove slot%d", i);
*hdl_ptrs[i] = NULL;
} }
} }
ESP_RETURN_ON_ERROR(sd_host_del_controller(s_ctlr), TAG, "failed to delete controller"); ESP_RETURN_ON_ERROR(sd_host_del_controller(s_ctlr), TAG, "failed to delete controller");