| From f83a96e5f033fbbd21764705cb9c04234b96218e Mon Sep 17 00:00:00 2001 |
| From: Benjamin Gaignard <benjamin.gaignard@collabora.com> |
| Date: Mon, 31 Jan 2022 15:17:08 +0100 |
| Subject: spi: mediatek: Avoid NULL pointer crash in interrupt |
| |
| From: Benjamin Gaignard <benjamin.gaignard@collabora.com> |
| |
| commit f83a96e5f033fbbd21764705cb9c04234b96218e upstream. |
| |
| 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: a568231f46322 ("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> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| --- |
| drivers/spi/spi-mt65xx.c | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| --- a/drivers/spi/spi-mt65xx.c |
| +++ b/drivers/spi/spi-mt65xx.c |
| @@ -540,7 +540,7 @@ static irqreturn_t mtk_spi_interrupt(int |
| 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, |
