From: Osama Abdelkader <osama.abdelkader@gmail.com>
To: Vinod Koul <vkoul@kernel.org>, Chen-Yu Tsai <wens@kernel.org>,
Jernej Skrabec <jernej.skrabec@gmail.com>,
Samuel Holland <samuel@sholland.org>,
dmaengine@vger.kernel.org, linux-arm-kernel@lists.infradead.org,
linux-sunxi@lists.linux.dev, linux-kernel@vger.kernel.org
Cc: Osama Abdelkader <osama.abdelkader@gmail.com>
Subject: [PATCH] dmaengine: sun4i: fix resource leak on promise allocation failure
Date: Fri, 12 Dec 2025 21:50:22 +0100 [thread overview]
Message-ID: <20251212205022.83482-1-osama.abdelkader@gmail.com> (raw)
When promise allocation fails in sun4i_dma_prep_dma_cyclic() or
sun4i_dma_prep_slave_sg(), the contract and already-allocated promises
are not freed, causing a resource leak.
Fix this by calling sun4i_dma_free_contract() to properly clean up
all resources before returning NULL on allocation failure.
This addresses the TODO comments that asked whether we should free
everything on error.
Signed-off-by: Osama Abdelkader <osama.abdelkader@gmail.com>
---
drivers/dma/sun4i-dma.c | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/drivers/dma/sun4i-dma.c b/drivers/dma/sun4i-dma.c
index 00d2fd38d17f..d81e705ae91f 100644
--- a/drivers/dma/sun4i-dma.c
+++ b/drivers/dma/sun4i-dma.c
@@ -861,7 +861,7 @@ sun4i_dma_prep_dma_cyclic(struct dma_chan *chan, dma_addr_t buf, size_t len,
plength, sconfig, dir);
if (!promise) {
- /* TODO: should we free everything? */
+ sun4i_dma_free_contract(&contract->vd);
return NULL;
}
promise->cfg |= endpoints;
@@ -954,8 +954,10 @@ sun4i_dma_prep_slave_sg(struct dma_chan *chan, struct scatterlist *sgl,
sg_dma_len(sg),
sconfig, dir);
- if (!promise)
- return NULL; /* TODO: should we free everything? */
+ if (!promise) {
+ sun4i_dma_free_contract(&contract->vd);
+ return NULL;
+ }
promise->cfg |= endpoints;
promise->para = para;
--
2.43.0
reply other threads:[~2025-12-12 20:51 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=20251212205022.83482-1-osama.abdelkader@gmail.com \
--to=osama.abdelkader@gmail.com \
--cc=dmaengine@vger.kernel.org \
--cc=jernej.skrabec@gmail.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-sunxi@lists.linux.dev \
--cc=samuel@sholland.org \
--cc=vkoul@kernel.org \
--cc=wens@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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®