Skip to content

Commit a697ae6

Browse files
sherllybroonie
authored andcommitted
ASoC: davinci-mcasp: Fix dma_chan refcnt leak when getting dma type
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 <[email protected]> Signed-off-by: Xin Tan <[email protected]> Acked-by: Peter Ujfalusi <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Mark Brown <[email protected]>
1 parent 1fecbb7 commit a697ae6

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

sound/soc/ti/davinci-mcasp.c

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1896,8 +1896,10 @@ static int davinci_mcasp_get_dma_type(struct davinci_mcasp *mcasp)
18961896
PTR_ERR(chan));
18971897
return PTR_ERR(chan);
18981898
}
1899-
if (WARN_ON(!chan->device || !chan->device->dev))
1899+
if (WARN_ON(!chan->device || !chan->device->dev)) {
1900+
dma_release_channel(chan);
19001901
return -EINVAL;
1902+
}
19011903

19021904
if (chan->device->dev->of_node)
19031905
ret = of_property_read_string(chan->device->dev->of_node,

0 commit comments

Comments
 (0)