Mirrors/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2026-10-02 11:10:54 +03:00
Code Issues Packages Projects Releases Wiki Activity

fix(spi_flash): Fix spi_flash leaks release aes-xts in error path

Browse Source 
(cherry picked from commit 305c5869ee)
This commit is contained in:
C.S.M
2026-07-24 14:52:19 +08:00
parent dd99b5a272
commit 6f14740263
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
components/spi_flash/spi_flash_chip_generic.c
+9 -4
View File
@@ -1,5 +1,5 @@
/* /*
* SPDX-FileCopyrightText: 2015-2025 Espressif Systems (Shanghai) CO LTD * SPDX-FileCopyrightText: 2015-2026 Espressif Systems (Shanghai) CO LTD
* *
* SPDX-License-Identifier: Apache-2.0 * SPDX-License-Identifier: Apache-2.0
*/ */
@@ -603,7 +603,7 @@ esp_err_t spi_flash_chip_generic_write_encrypted(esp_flash_t *chip, const void *
esp_flash_encryption->flash_encryption_data_prepare(address, (uint32_t *)data_bytes, block_size); esp_flash_encryption->flash_encryption_data_prepare(address, (uint32_t *)data_bytes, block_size);
err = chip->chip_drv->set_chip_write_protect(chip, false); err = chip->chip_drv->set_chip_write_protect(chip, false);
if (err != ESP_OK) { if (err != ESP_OK) {
return err; goto err_out;
} }
// Waiting for encrypting buffer to finish and making result visible for SPI1 // Waiting for encrypting buffer to finish and making result visible for SPI1
esp_flash_encryption->flash_encryption_done(); esp_flash_encryption->flash_encryption_done();
@@ -614,11 +614,11 @@ esp_err_t spi_flash_chip_generic_write_encrypted(esp_flash_t *chip, const void *
err = chip->chip_drv->write(chip, (uint32_t *)data_bytes, address, length); err = chip->chip_drv->write(chip, (uint32_t *)data_bytes, address, length);
if (err != ESP_OK) { if (err != ESP_OK) {
return err; goto err_out;
} }
err = chip->chip_drv->wait_idle(chip, chip->chip_drv->timeout->page_program_timeout); err = chip->chip_drv->wait_idle(chip, chip->chip_drv->timeout->page_program_timeout);
if (err != ESP_OK) { if (err != ESP_OK) {
return err; goto err_out;
} }
// Note: we don't wait for idle status here, because this way // Note: we don't wait for idle status here, because this way
@@ -634,6 +634,11 @@ esp_err_t spi_flash_chip_generic_write_encrypted(esp_flash_t *chip, const void *
esp_flash_encryption->flash_encryption_disable(); esp_flash_encryption->flash_encryption_disable();
return err; return err;
err_out:
esp_flash_encryption->flash_encryption_destroy();
esp_flash_encryption->flash_encryption_disable();
return err;
} }
#endif // !CONFIG_SPI_FLASH_ROM_IMPL || ESP_ROM_HAS_ENCRYPTED_WRITES_USING_LEGACY_DRV #endif // !CONFIG_SPI_FLASH_ROM_IMPL || ESP_ROM_HAS_ENCRYPTED_WRITES_USING_LEGACY_DRV