Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c9dafb27 authored by Andy Shevchenko's avatar Andy Shevchenko Committed by Mark Brown
Browse files

spi: dw-mid: avoid potential NULL dereference 



When DMA descriptor allocation fails we should not try to assign any fields in
the bad descriptor. The patch adds the necessary checks for that.

Fixes: 7063c0d9 (spi/dw_spi: add DMA support)
Signed-off-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
Cc: stable@vger.kernel.org
parent 9d239d35

drivers/spi/spi-dw-mid.c

+6 −0
Original line number Original line Diff line number Diff line
@@ -139,6 +139,9 @@ static struct dma_async_tx_descriptor *dw_spi_dma_prepare_tx(struct dw_spi *dws) 
				1,

				1,

				DMA_MEM_TO_DEV,

				DMA_MEM_TO_DEV,

				DMA_PREP_INTERRUPT | DMA_CTRL_ACK);

				DMA_PREP_INTERRUPT | DMA_CTRL_ACK);

	if (!txdesc)

		return NULL;



	txdesc->callback = dw_spi_dma_tx_done;

	txdesc->callback = dw_spi_dma_tx_done;

	txdesc->callback_param = dws;

	txdesc->callback_param = dws;
@@ -184,6 +187,9 @@ static struct dma_async_tx_descriptor *dw_spi_dma_prepare_rx(struct dw_spi *dws) 
				1,

				1,

				DMA_DEV_TO_MEM,

				DMA_DEV_TO_MEM,

				DMA_PREP_INTERRUPT | DMA_CTRL_ACK);

				DMA_PREP_INTERRUPT | DMA_CTRL_ACK);

	if (!rxdesc)

		return NULL;



	rxdesc->callback = dw_spi_dma_rx_done;

	rxdesc->callback = dw_spi_dma_rx_done;

	rxdesc->callback_param = dws;

	rxdesc->callback_param = dws;