diff options
| author | Amelie Delaunay <amelie.delaunay@foss.st.com> | 2023-10-04 18:35:28 +0200 |
|---|---|---|
| committer | Vinod Koul <vkoul@kernel.org> | 2023-10-09 07:40:30 +0200 |
| commit | 81337b9a72dc58a5fa0ae8a042e8cb59f9bdec4a (patch) | |
| tree | f34599eba969d8e06b32e869239dfaea2c726d79 | |
| parent | dmaengine: ste_dma40: Fix PM disable depth imbalance in d40_probe (diff) | |
| download | linux-81337b9a72dc58a5fa0ae8a042e8cb59f9bdec4a.tar.xz linux-81337b9a72dc58a5fa0ae8a042e8cb59f9bdec4a.zip | |
dmaengine: stm32-mdma: abort resume if no ongoing transfer
chan->desc can be null, if transfer is terminated when resume is called,
leading to a NULL pointer when retrieving the hwdesc.
To avoid this case, check that chan->desc is not null and channel is
disabled (transfer previously paused or terminated).
Fixes: a4ffb13c8946 ("dmaengine: Add STM32 MDMA driver")
Signed-off-by: Amelie Delaunay <amelie.delaunay@foss.st.com>
Cc: stable@vger.kernel.org
Link: https://lore.kernel.org/r/20231004163531.2864160-1-amelie.delaunay@foss.st.com
Signed-off-by: Vinod Koul <vkoul@kernel.org>
| -rw-r--r-- | drivers/dma/stm32-mdma.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/dma/stm32-mdma.c b/drivers/dma/stm32-mdma.c index 0de234022c6d..cc6f4b00091f 100644 --- a/drivers/dma/stm32-mdma.c +++ b/drivers/dma/stm32-mdma.c @@ -1236,6 +1236,10 @@ static int stm32_mdma_resume(struct dma_chan *c) unsigned long flags; u32 status, reg; + /* Transfer can be terminated */ + if (!chan->desc || (stm32_mdma_read(dmadev, STM32_MDMA_CCR(chan->id)) & STM32_MDMA_CCR_EN)) + return -EPERM; + hwdesc = chan->desc->node[chan->curr_hwdesc].hwdesc; spin_lock_irqsave(&chan->vchan.lock, flags); |