summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorHui Wang <hui.wang@canonical.com>2022-11-30 17:08:00 +0800
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2023-02-06 07:49:44 +0100
commit80ee99e52936b2c04cc37b17a14b2ae2f9d282ac (patch)
tree5a7e7a57c2041d122b6716d6f93fda962e07cc28 /drivers
parentd86927fd1f84e27e6d4d13bf82fe113a1216b848 (diff)
downloadlinux-stable-80ee99e52936b2c04cc37b17a14b2ae2f9d282ac.tar.gz
linux-stable-80ee99e52936b2c04cc37b17a14b2ae2f9d282ac.tar.bz2
linux-stable-80ee99e52936b2c04cc37b17a14b2ae2f9d282ac.zip
dmaengine: imx-sdma: Fix a possible memory leak in sdma_transfer_init
[ 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>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/dma/imx-sdma.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/dma/imx-sdma.c b/drivers/dma/imx-sdma.c
index 709ead443fc5..5794d3120bb8 100644
--- a/drivers/dma/imx-sdma.c
+++ b/drivers/dma/imx-sdma.c
@@ -1347,10 +1347,12 @@ static struct sdma_desc *sdma_transfer_init(struct sdma_channel *sdmac,
sdma_config_ownership(sdmac, false, true, false);
if (sdma_load_context(sdmac))
- goto err_desc_out;
+ goto err_bd_out;
return desc;
+err_bd_out:
+ sdma_free_bd(desc);
err_desc_out:
kfree(desc);
err_out: