summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBenjamin Gaignard <benjamin.gaignard@collabora.com>2022-01-31 15:17:08 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2022-02-08 18:24:30 +0100
commitfe58eb96bb411e4ab2a4aa018ceae47576b35bac (patch)
treec6d9750c901d0dbcdda3e6a7906d7298b8c7955a
parentc9fc48511c65a4f2bb7f57aa91acc6ef324225d0 (diff)
downloadlinux-stable-fe58eb96bb411e4ab2a4aa018ceae47576b35bac.tar.gz
linux-stable-fe58eb96bb411e4ab2a4aa018ceae47576b35bac.tar.bz2
linux-stable-fe58eb96bb411e4ab2a4aa018ceae47576b35bac.zip
spi: mediatek: Avoid NULL pointer crash in interrupt
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>
-rw-r--r--drivers/spi/spi-mt65xx.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/spi/spi-mt65xx.c b/drivers/spi/spi-mt65xx.c
index cafb773f7861..29d44f5d5212 100644
--- a/drivers/spi/spi-mt65xx.c
+++ b/drivers/spi/spi-mt65xx.c
@@ -533,7 +533,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,