From: Sasha Levin <sashal@kernel.org>
To: linux-kernel@vger.kernel.org, stable@vger.kernel.org
Cc: Hui Wang <hui.wang@canonical.com>,
Sascha Hauer <s.hauer@pengutronix.de>,
Vinod Koul <vkoul@kernel.org>, Sasha Levin <sashal@kernel.org>,
shawnguo@kernel.org, dmaengine@vger.kernel.org,
linux-arm-kernel@lists.infradead.org
Subject: [PATCH AUTOSEL 5.15 12/14] dmaengine: imx-sdma: Fix a possible memory leak in sdma_transfer_init
Date: Tue, 24 Jan 2023 08:42:55 -0500 [thread overview]
Message-ID: <20230124134257.637523-12-sashal@kernel.org> (raw)
In-Reply-To: <20230124134257.637523-1-sashal@kernel.org>
From: Hui Wang <hui.wang@canonical.com>
[ 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>
---
drivers/dma/imx-sdma.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/drivers/dma/imx-sdma.c b/drivers/dma/imx-sdma.c
index 5215a5e39f3c..292f4c9a963d 100644
--- a/drivers/dma/imx-sdma.c
+++ b/drivers/dma/imx-sdma.c
@@ -1428,10 +1428,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:
--
2.39.0
WARNING: multiple messages have this Message-ID (diff)
From: Sasha Levin <sashal@kernel.org>
To: linux-kernel@vger.kernel.org, stable@vger.kernel.org
Cc: Hui Wang <hui.wang@canonical.com>,
Sascha Hauer <s.hauer@pengutronix.de>,
Vinod Koul <vkoul@kernel.org>, Sasha Levin <sashal@kernel.org>,
shawnguo@kernel.org, dmaengine@vger.kernel.org,
linux-arm-kernel@lists.infradead.org
Subject: [PATCH AUTOSEL 5.15 12/14] dmaengine: imx-sdma: Fix a possible memory leak in sdma_transfer_init
Date: Tue, 24 Jan 2023 08:42:55 -0500 [thread overview]
Message-ID: <20230124134257.637523-12-sashal@kernel.org> (raw)
In-Reply-To: <20230124134257.637523-1-sashal@kernel.org>
From: Hui Wang <hui.wang@canonical.com>
[ 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>
---
drivers/dma/imx-sdma.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/drivers/dma/imx-sdma.c b/drivers/dma/imx-sdma.c
index 5215a5e39f3c..292f4c9a963d 100644
--- a/drivers/dma/imx-sdma.c
+++ b/drivers/dma/imx-sdma.c
@@ -1428,10 +1428,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:
--
2.39.0
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2023-01-24 13:45 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-01-24 13:42 [PATCH AUTOSEL 5.15 01/14] ARM: dts: imx: Fix pca9547 i2c-mux node name Sasha Levin
2023-01-24 13:42 ` Sasha Levin
2023-01-24 13:42 ` [PATCH AUTOSEL 5.15 02/14] ARM: dts: vf610: Fix pca9548 i2c-mux node names Sasha Levin
2023-01-24 13:42 ` Sasha Levin
2023-01-24 13:42 ` [PATCH AUTOSEL 5.15 03/14] arm64: dts: freescale: Fix pca954x " Sasha Levin
2023-01-24 13:42 ` Sasha Levin
2023-01-24 13:42 ` [PATCH AUTOSEL 5.15 04/14] arm64: dts: imx8mq-thor96: fix no-mmc property for SDHCI Sasha Levin
2023-01-24 13:42 ` Sasha Levin
2023-01-24 13:42 ` [PATCH AUTOSEL 5.15 05/14] firmware: arm_scmi: Clear stale xfer->hdr.status Sasha Levin
2023-01-24 13:42 ` Sasha Levin
2023-01-24 13:42 ` [PATCH AUTOSEL 5.15 06/14] bpf: Skip task with pid=1 in send_signal_common() Sasha Levin
2023-01-24 13:42 ` [PATCH AUTOSEL 5.15 07/14] erofs/zmap.c: Fix incorrect offset calculation Sasha Levin
2023-01-24 13:42 ` Sasha Levin
2023-01-24 13:42 ` [PATCH AUTOSEL 5.15 08/14] init/Kconfig: fix LOCALVERSION_AUTO help text Sasha Levin
2023-01-24 13:42 ` [PATCH AUTOSEL 5.15 09/14] btrfs: factor out scratching of one regular super block Sasha Levin
2023-01-24 13:44 ` Christoph Hellwig
2023-01-24 13:42 ` [PATCH AUTOSEL 5.15 10/14] blk-cgroup: fix missing pd_online_fn() while activating policy Sasha Levin
2023-01-24 13:42 ` Sasha Levin
2023-01-24 13:42 ` [PATCH AUTOSEL 5.15 11/14] HID: playstation: sanity check DualSense calibration data Sasha Levin
2023-01-24 13:42 ` Sasha Levin [this message]
2023-01-24 13:42 ` [PATCH AUTOSEL 5.15 12/14] dmaengine: imx-sdma: Fix a possible memory leak in sdma_transfer_init Sasha Levin
2023-01-24 13:42 ` [PATCH AUTOSEL 5.15 13/14] cifs: fix return of uninitialized rc in dfs_cache_update_tgthint() Sasha Levin
2023-01-24 13:42 ` [PATCH AUTOSEL 5.15 14/14] ext4: deal with legacy signed xattr name hash values Sasha Levin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230124134257.637523-12-sashal@kernel.org \
--to=sashal@kernel.org \
--cc=dmaengine@vger.kernel.org \
--cc=hui.wang@canonical.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=s.hauer@pengutronix.de \
--cc=shawnguo@kernel.org \
--cc=stable@vger.kernel.org \
--cc=vkoul@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.