From: Shuai Xue <xueshuai@linux.alibaba.com>
To: vinicius.gomes@intel.com, dave.jiang@intel.com, vkoul@kernel.org
Cc: nikhil.rao@intel.com, xueshuai@linux.alibaba.com,
dmaengine@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH v2 2/7] dmaengine: idxd: fix memory leak in error handling path of idxd_setup_engines
Date: Sat, 15 Feb 2025 13:44:26 +0800 [thread overview]
Message-ID: <20250215054431.55747-3-xueshuai@linux.alibaba.com> (raw)
In-Reply-To: <20250215054431.55747-1-xueshuai@linux.alibaba.com>
Memory allocated for engines is not freed if an error occurs during
idxd_setup_engines(). To fix it, free the allocated memory in the
reverse order of allocation before exiting the function in case of an
error.
Fixes: 75b911309060 ("dmaengine: idxd: fix engine conf_dev lifetime")
Signed-off-by: Shuai Xue <xueshuai@linux.alibaba.com>
Reviewed-by: Dave Jiang <dave.jiang@intel.com>
---
drivers/dma/idxd/init.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/drivers/dma/idxd/init.c b/drivers/dma/idxd/init.c
index b85736fd25bd..4e47075c5bef 100644
--- a/drivers/dma/idxd/init.c
+++ b/drivers/dma/idxd/init.c
@@ -277,6 +277,7 @@ static int idxd_setup_engines(struct idxd_device *idxd)
rc = dev_set_name(conf_dev, "engine%d.%d", idxd->id, engine->id);
if (rc < 0) {
put_device(conf_dev);
+ kfree(engine);
goto err;
}
@@ -290,7 +291,10 @@ static int idxd_setup_engines(struct idxd_device *idxd)
engine = idxd->engines[i];
conf_dev = engine_confdev(engine);
put_device(conf_dev);
+ kfree(engine);
}
+ kfree(idxd->engines);
+
return rc;
}
--
2.39.3
next prev parent reply other threads:[~2025-02-15 5:44 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-02-15 5:44 [PATCH v2 0/7] dmaengine: idxd: fix memory leak in error handling path Shuai Xue
2025-02-15 5:44 ` [PATCH v2 1/7] dmaengine: idxd: fix memory leak in error handling path of idxd_setup_wqs Shuai Xue
2025-02-15 11:00 ` [PATCH v2 1/7] dmaengine: idxd: fix memory leak in error handling path of idxd_setup_wqs() Markus Elfring
2025-02-16 9:24 ` Shuai Xue
2025-02-16 9:34 ` [v2 " Markus Elfring
2025-02-16 11:04 ` Shuai Xue
2025-02-15 13:34 ` [PATCH v2 1/7] dmaengine: idxd: fix memory leak in error handling path of idxd_setup_wqs Markus Elfring
2025-02-16 9:25 ` Shuai Xue
2025-02-18 16:32 ` Fenghua Yu
2025-02-19 9:08 ` Shuai Xue
2025-02-15 5:44 ` Shuai Xue [this message]
2025-02-18 20:24 ` [PATCH v2 2/7] dmaengine: idxd: fix memory leak in error handling path of idxd_setup_engines Fenghua Yu
2025-02-15 5:44 ` [PATCH v2 3/7] dmaengine: idxd: fix memory leak in error handling path of idxd_setup_groups Shuai Xue
2025-02-18 20:20 ` Fenghua Yu
2025-02-19 11:06 ` Shuai Xue
2025-02-15 5:44 ` [PATCH v2 4/7] dmaengine: idxd: fix memory leak in error handling path of idxd_alloc Shuai Xue
2025-02-15 5:44 ` [PATCH v2 5/7] dmaengine: idxd: fix memory leak in error handling path of idxd_pci_probe Shuai Xue
2025-02-18 20:21 ` Fenghua Yu
2025-02-19 12:28 ` Shuai Xue
2025-02-19 13:05 ` Shuai Xue
2025-02-15 5:44 ` [PATCH v2 6/7] dmaengine: idxd: Add missing idxd cleanup to fix memory leak in remove call Shuai Xue
2025-02-15 5:44 ` [PATCH v2 7/7] dmaengine: idxd: Refactor remove call with idxd_cleanup() helper Shuai Xue
2025-02-18 21:01 ` Fenghua Yu
2025-02-19 13:28 ` Shuai Xue
2025-03-03 2:01 ` Shuai Xue
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=20250215054431.55747-3-xueshuai@linux.alibaba.com \
--to=xueshuai@linux.alibaba.com \
--cc=dave.jiang@intel.com \
--cc=dmaengine@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=nikhil.rao@intel.com \
--cc=vinicius.gomes@intel.com \
--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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox