Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

dmaengine: dma-jz4780: Fix race in jz4780_dma_tx_status

The jz4780_dma_tx_status() function would check if a channel's cookie
state was set to 'completed', and if not, it would enter the critical
section. However, in that time frame, the jz4780_dma_chan_irq() function
was able to set the cookie to 'completed', and clear the jzchan->vchan
pointer, which was deferenced in the critical section of the first
function.

Fix this race by checking the channel's cookie state after entering the
critical function and not before.

Fixes: d894fc6046fe ("dmaengine: jz4780: add driver for the Ingenic JZ4780 DMA controller")
Cc: stable@vger.kernel.org # v4.0
Signed-off-by: Paul Cercueil <paul@crapouillou.net>
Reported-by: Artur Rojek <contact@artur-rojek.eu>
Tested-by: Artur Rojek <contact@artur-rojek.eu>
Link: https://lore.kernel.org/r/20201004140307.885556-1-paul@crapouillou.net
Signed-off-by: Vinod Koul <vkoul@kernel.org>

authored by

Paul Cercueil and committed by
Vinod Koul
baf6fd97 a841592f

+4 -3
+4 -3
drivers/dma/dma-jz4780.c
··· 639 639 unsigned long flags; 640 640 unsigned long residue = 0; 641 641 642 + spin_lock_irqsave(&jzchan->vchan.lock, flags); 643 + 642 644 status = dma_cookie_status(chan, cookie, txstate); 643 645 if ((status == DMA_COMPLETE) || (txstate == NULL)) 644 - return status; 645 - 646 - spin_lock_irqsave(&jzchan->vchan.lock, flags); 646 + goto out_unlock_irqrestore; 647 647 648 648 vdesc = vchan_find_desc(&jzchan->vchan, cookie); 649 649 if (vdesc) { ··· 660 660 && jzchan->desc->status & (JZ_DMA_DCS_AR | JZ_DMA_DCS_HLT)) 661 661 status = DMA_ERROR; 662 662 663 + out_unlock_irqrestore: 663 664 spin_unlock_irqrestore(&jzchan->vchan.lock, flags); 664 665 return status; 665 666 }