omap2_mcspi.c: Checks in omap2_mcspi_cleanup
PATCH 1/1 omap2_mcspi.c: Checks in omap2_mcspi_cleanup
Check spi->controller_state before dereferencing.
Check spi->chip_select for range before using.
Neither are guaranteed to be valid when spi_dev_put() is called. Submitted previously to the linux-kernel list but without the chip_select check.
Signed-off-by Scott Ellis <[email protected]>
drivers/spi/omap2_mcspi.c | 30 +++++++++++++++++------------- 1 files changed, 17 insertions(+), 13 deletions(-)
drivers/spi/omap2_mcspi.c +17 -13
@@ -748,22 +748,26 @@ static void omap2_mcspi_cleanup(struct spi_device *spi)struct omap2_mcspi_dma *mcspi_dma;struct omap2_mcspi_cs *cs; - mcspi =spi_master_get_devdata (spi->master); - mcspi_dma = &mcspi->dma_channels[spi->chip_select]; +if (spi->controller_state) { +/* Unlink controller state from context save list */ + cs = spi->controller_state; +list_del (&cs->node); -/* Unlink controller state from context save list */ - cs = spi->controller_state; -list_del (&cs->node); +kfree (spi->controller_state); + } -kfree (spi->controller_state); +if (spi->chip_select < spi->master->num_chipselect) { + mcspi =spi_master_get_devdata (spi->master); + mcspi_dma = &mcspi->dma_channels[spi->chip_select]; -if (mcspi_dma->dma_rx_channel !=-1 ) { -omap_free_dma (mcspi_dma->dma_rx_channel); - mcspi_dma->dma_rx_channel =-1 ; - } -if (mcspi_dma->dma_tx_channel !=-1 ) { -omap_free_dma (mcspi_dma->dma_tx_channel); - mcspi_dma->dma_tx_channel =-1 ; +if (mcspi_dma->dma_rx_channel !=-1 ) { +omap_free_dma (mcspi_dma->dma_rx_channel); + mcspi_dma->dma_rx_channel =-1 ; + } +if (mcspi_dma->dma_tx_channel !=-1 ) { +omap_free_dma (mcspi_dma->dma_tx_channel); + mcspi_dma->dma_tx_channel =-1 ; + } } }