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

sdmmc: fix possible null dereference in output parameter assignement, whilst it was null checked as an input parameter

Browse Source
This commit is contained in:
David Cermak
2019-10-21 15:34:34 +02:00
parent a2d55ddece
commit 9b821ddd6b
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
components/sdmmc/sdmmc_io.c
View File

@@ -567,6 +567,9 @@ esp_err_t sdmmc_io_get_cis_data(sdmmc_card_t* card, uint8_t* out_buffer, size_t
esp_err_t ret = ESP_OK; esp_err_t ret = ESP_OK;
WORD_ALIGNED_ATTR uint8_t buf[CIS_GET_MINIMAL_SIZE]; WORD_ALIGNED_ATTR uint8_t buf[CIS_GET_MINIMAL_SIZE];
/* Pointer to size is a mandatory parameter */
assert(inout_cis_size);
/* /*
* CIS region exist in 0x1000~0x17FFF of FUNC 0, get the start address of it * CIS region exist in 0x1000~0x17FFF of FUNC 0, get the start address of it
* from CCCR register. * from CCCR register.
@@ -585,7 +588,7 @@ esp_err_t sdmmc_io_get_cis_data(sdmmc_card_t* card, uint8_t* out_buffer, size_t
* existing. * existing.
*/ */
size_t max_reading = UINT32_MAX; size_t max_reading = UINT32_MAX;
if (inout_cis_size && *inout_cis_size != 0) { if (*inout_cis_size != 0) {
max_reading = *inout_cis_size; max_reading = *inout_cis_size;
} }