lisa/android_kernel_xiaomi_sm8350
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

dmaengine: imx-sdma: Fix a possible memory leak in sdma_transfer_init

Browse Source 
[ Upstream commit 1417f59ac0b02130ee56c0c50794b9b257be3d17 ]

If the function sdma_load_context() fails, the sdma_desc will be
freed, but the allocated desc->bd is forgot to be freed.

We already met the sdma_load_context() failure case and the log as
below:
[ 450.699064] imx-sdma 30bd0000.dma-controller: Timeout waiting for CH0 ready
...

In this case, the desc->bd will not be freed without this change.

Signed-off-by: Hui Wang <hui.wang@canonical.com>
Reviewed-by: Sascha Hauer <s.hauer@pengutronix.de>
Link: https://lore.kernel.org/r/20221130090800.102035-1-hui.wang@canonical.com
Signed-off-by: Vinod Koul <vkoul@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Hui Wang 2022-11-30 17:08:00 +08:00 committed by Greg Kroah-Hartman
parent 1986cd616b
commit dbe634ce82
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/dma/imx-sdma.c
View File

@ -1360,10 +1360,12 @@ static struct sdma_desc *sdma_transfer_init(struct sdma_channel *sdmac,
sdma_config_ownership(sdmac, false, true, false); sdma_config_ownership(sdmac, false, true, false);
if (sdma_load_context(sdmac)) if (sdma_load_context(sdmac))
goto err_desc_out; goto err_bd_out;
return desc; return desc;
err_bd_out:
sdma_free_bd(desc);
err_desc_out: err_desc_out:
kfree(desc); kfree(desc);
err_out: err_out: