jacob.eva/arduino-esp32
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix spiTransferBytesNL() writes past end of data_out

Browse Source 
Fixes: https://github.com/espressif/arduino-esp32/issues/4935
This commit is contained in:
me-no-dev 2021-03-15 10:40:50 +02:00
parent 35643bdd9b
commit a31f30529d
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
cores/esp32/esp32-hal-spi.c
View File

@ -914,10 +914,22 @@ void spiTransferBytesNL(spi_t * spi, const void * data_in, uint8_t * data_out, u
spi->dev->cmd.usr = 1; spi->dev->cmd.usr = 1;
while(spi->dev->cmd.usr); while(spi->dev->cmd.usr);
if(result){ if(result){
if(c_len & 3){
for (int i=0; i<(c_longs-1); i++) {
result[i] = spi->dev->data_buf[i];
}
uint32_t last_data = spi->dev->data_buf[c_longs-1];
uint8_t * last_out8 = &result[c_longs-1];
uint8_t * last_data8 = &last_data;
for (int i=0; i<(c_len & 3); i++) {
last_out8[i] = last_data8[i];
}
} else {
for (int i=0; i<c_longs; i++) { for (int i=0; i<c_longs; i++) {
result[i] = spi->dev->data_buf[i]; result[i] = spi->dev->data_buf[i];
} }
} }
}
if(data){ if(data){
data += c_longs; data += c_longs;
} }