]> git.baikalelectronics.ru Git - kernel.git/commitdiff
spi: mediatek: Avoid NULL pointer crash in interrupt
authorBenjamin Gaignard <benjamin.gaignard@collabora.com>
Mon, 31 Jan 2022 14:17:08 +0000 (15:17 +0100)
committerMark Brown <broonie@kernel.org>
Mon, 31 Jan 2022 15:24:05 +0000 (15:24 +0000)
In some case, like after a transfer timeout, master->cur_msg pointer
is NULL which led to a kernel crash when trying to use master->cur_msg->spi.
mtk_spi_can_dma(), pointed by master->can_dma, doesn't use this parameter
avoid the problem by setting NULL as second parameter.

Fixes: 33bc38a533992 ("spi: mediatek: Add spi bus for Mediatek MT8173")
Signed-off-by: Benjamin Gaignard <benjamin.gaignard@collabora.com>
Link: https://lore.kernel.org/r/20220131141708.888710-1-benjamin.gaignard@collabora.com
Signed-off-by: Mark Brown <broonie@kernel.org>
drivers/spi/spi-mt65xx.c

index a15de10ee286a9e4f7760295fc2420fd8b51c68c..753bd313e6fdaaabe4063fc068e84d8d05b42983 100644 (file)
@@ -624,7 +624,7 @@ static irqreturn_t mtk_spi_interrupt(int irq, void *dev_id)
        else
                mdata->state = MTK_SPI_IDLE;
 
-       if (!master->can_dma(master, master->cur_msg->spi, trans)) {
+       if (!master->can_dma(master, NULL, trans)) {
                if (trans->rx_buf) {
                        cnt = mdata->xfer_len / 4;
                        ioread32_rep(mdata->base + SPI_RX_DATA_REG,