ARMmbed
/
mbed-os
mirror of https://github.com/ARMmbed/mbed-os.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

SiLabs: serial_api: Fix memory underflow read in DMA handling 

Code would index DMA irq fired array without checking the DMA handle,
which would be -1 when DMA was not used.
pull/1501/head
Mikko Polojarvi 2015-12-16 13:07:26 +02:00 committed by Steven Cooreman
parent a6e137f188
commit 6c3418a0c0
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libraries/mbed/targets/hal/TARGET_Silicon_Labs/TARGET_EFM32/serial_api.c
View File

@ -2087,14 +2087,16 @@ int serial_irq_handler_asynch(serial_t *obj)
}
/* First, check if we're running in DMA mode */
if(serial_dma_irq_fired[obj->serial.dmaOptionsRX.dmaChannel]) {
if( (obj->serial.dmaOptionsRX.dmaChannel != -1) &&
serial_dma_irq_fired[obj->serial.dmaOptionsRX.dmaChannel]) {
/* Clean up */
serial_dma_irq_fired[obj->serial.dmaOptionsRX.dmaChannel] = false;
serial_rx_abort_asynch_intern(obj, 1);
/* Notify CPP land of RX completion */
return SERIAL_EVENT_RX_COMPLETE & obj->serial.events;
} else if (txc_int && serial_dma_irq_fired[obj->serial.dmaOptionsTX.dmaChannel]) {
} else if (txc_int && (obj->serial.dmaOptionsTX.dmaChannel != -1) &&
serial_dma_irq_fired[obj->serial.dmaOptionsTX.dmaChannel]) {
if(LEUART_REF_VALID(obj->serial.periph.leuart)) {
/* Clean up */
serial_dma_irq_fired[obj->serial.dmaOptionsTX.dmaChannel] = false;