ASoC: davinci-mcasp: Fix dma_chan refcnt leak when getting dma type
authorXiyu Yang <xiyuyang19@fudan.edu.cn>
Sat, 25 Apr 2020 12:48:35 +0000 (20:48 +0800)
committerMark Brown <broonie@kernel.org>
Tue, 28 Apr 2020 12:33:56 +0000 (13:33 +0100)
davinci_mcasp_get_dma_type() invokes dma_request_chan(), which returns a
reference of the specified dma_chan object to "chan" with increased
refcnt.

When davinci_mcasp_get_dma_type() returns, local variable "chan" becomes
invalid, so the refcount should be decreased to keep refcount balanced.

The reference counting issue happens in one exception handling path of
davinci_mcasp_get_dma_type(). When chan device is NULL, the function
forgets to decrease the refcnt increased by dma_request_chan(), causing
a refcnt leak.

Fix this issue by calling dma_release_channel() when chan device is
NULL.

Signed-off-by: Xiyu Yang <xiyuyang19@fudan.edu.cn>
Signed-off-by: Xin Tan <tanxin.ctf@gmail.com>
Acked-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
Link: https://lore.kernel.org/r/1587818916-38730-1-git-send-email-xiyuyang19@fudan.edu.cn
Signed-off-by: Mark Brown <broonie@kernel.org>
sound/soc/ti/davinci-mcasp.c

index 734ffe9..7a7db74 100644 (file)
@@ -1896,8 +1896,10 @@ static int davinci_mcasp_get_dma_type(struct davinci_mcasp *mcasp)
                                PTR_ERR(chan));
                return PTR_ERR(chan);
        }
-       if (WARN_ON(!chan->device || !chan->device->dev))
+       if (WARN_ON(!chan->device || !chan->device->dev)) {
+               dma_release_channel(chan);
                return -EINVAL;
+       }
 
        if (chan->device->dev->of_node)
                ret = of_property_read_string(chan->device->dev->of_node,