]> git.proxmox.com Git - mirror_ubuntu-jammy-kernel.git/commitdiff
dmaengine: stm32-dma: Fix unchecked deference of chan->desc
authorM'boumba Cedric Madianga <cedric.madianga@gmail.com>
Mon, 7 Dec 2015 11:00:28 +0000 (12:00 +0100)
committerVinod Koul <vinod.koul@intel.com>
Thu, 10 Dec 2015 04:15:22 +0000 (09:45 +0530)
'commit d8b468394fb7 ("dmaengine: Add STM32 DMA driver")' leads to the
following Smatch complaint:

drivers/dma/stm32-dma.c:562 stm32_dma_issue_pending()
    error: we previously assumed 'chan->desc' could be null (see line 560)

So, this patch fixes the unchecked dereference of chan->desc by returning
operation not permitted error when stm32_dma_start_transfer() does not
succeed to allocate a virtual channel descriptor.

Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: M'boumba Cedric Madianga <cedric.madianga@gmail.com>
Signed-off-by: Vinod Koul <vinod.koul@intel.com>
drivers/dma/stm32-dma.c

index 12f3a3eddba9254a7d72fc637c363e09152f08c5..047476a1383dd984edd2afeb2bf2e1bfd5867074 100644 (file)
@@ -437,7 +437,7 @@ static int stm32_dma_start_transfer(struct stm32_dma_chan *chan)
        if (!chan->desc) {
                vdesc = vchan_next_desc(&chan->vchan);
                if (!vdesc)
-                       return 0;
+                       return -EPERM;
 
                chan->desc = to_stm32_dma_desc(vdesc);
                chan->next_sg = 0;
@@ -559,7 +559,7 @@ static void stm32_dma_issue_pending(struct dma_chan *c)
        if (!chan->busy) {
                if (vchan_issue_pending(&chan->vchan) && !chan->desc) {
                        ret = stm32_dma_start_transfer(chan);
-                       if ((chan->desc->cyclic) && (!ret))
+                       if ((!ret) && (chan->desc->cyclic))
                                stm32_dma_configure_next_sg(chan);
                }
        }