From: Shuai Xue <xueshuai@linux.alibaba.com>
To: vinicius.gomes@intel.com, dave.jiang@intel.com,
Markus.Elfring@web.de, fenghuay@nvidia.com, vkoul@kernel.org
Cc: xueshuai@linux.alibaba.com, dmaengine@vger.kernel.org,
linux-kernel@vger.kernel.org
Subject: [PATCH v3 7/9] dmaengine: idxd: fix memory leak in error handling path of idxd_pci_probe
Date: Sun, 9 Mar 2025 14:20:56 +0800 [thread overview]
Message-ID: <20250309062058.58910-8-xueshuai@linux.alibaba.com> (raw)
In-Reply-To: <20250309062058.58910-1-xueshuai@linux.alibaba.com>
Memory allocated for idxd is not freed if an error occurs during
idxd_pci_probe(). To fix it, free the allocated memory in the reverse
order of allocation before exiting the function in case of an error.
Fixes: bfe1d56091c1 ("dmaengine: idxd: Init and probe for Intel data accelerators")
Cc: stable@vger.kernel.org
Signed-off-by: Shuai Xue <xueshuai@linux.alibaba.com>
Reviewed-by: Dave Jiang <dave.jiang@intel.com>
---
drivers/dma/idxd/init.c | 13 ++++++++++++-
1 file changed, 12 insertions(+), 1 deletion(-)
diff --git a/drivers/dma/idxd/init.c b/drivers/dma/idxd/init.c
index 71d92c05c0c6..890b2bbd2c5e 100644
--- a/drivers/dma/idxd/init.c
+++ b/drivers/dma/idxd/init.c
@@ -588,6 +588,17 @@ static void idxd_read_caps(struct idxd_device *idxd)
idxd->hw.iaa_cap.bits = ioread64(idxd->reg_base + IDXD_IAACAP_OFFSET);
}
+static void idxd_free(struct idxd_device *idxd)
+{
+ if (!idxd)
+ return;
+
+ put_device(idxd_confdev(idxd));
+ bitmap_free(idxd->opcap_bmap);
+ ida_free(&idxd_ida, idxd->id);
+ kfree(idxd);
+}
+
static struct idxd_device *idxd_alloc(struct pci_dev *pdev, struct idxd_driver_data *data)
{
struct device *dev = &pdev->dev;
@@ -1257,7 +1268,7 @@ int idxd_pci_probe_alloc(struct idxd_device *idxd, struct pci_dev *pdev,
err:
pci_iounmap(pdev, idxd->reg_base);
err_iomap:
- put_device(idxd_confdev(idxd));
+ idxd_free(idxd);
err_idxd_alloc:
pci_disable_device(pdev);
return rc;
--
2.39.3
next prev parent reply other threads:[~2025-03-09 6:21 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-03-09 6:20 [PATCH v3 0/9] dmaengine: idxd: fix memory leak in error handling path Shuai Xue
2025-03-09 6:20 ` [PATCH v3 1/9] dmaengine: idxd: fix memory leak in error handling path of idxd_setup_wqs Shuai Xue
2025-03-09 9:10 ` [PATCH v3 1/9] dmaengine: idxd: fix memory leak in error handling path of idxd_setup_wqs() Markus Elfring
2025-03-10 1:42 ` Shuai Xue
2025-03-10 9:50 ` [v3 " Markus Elfring
2025-04-02 23:22 ` [PATCH v3 1/9] dmaengine: idxd: fix memory leak in error handling path of idxd_setup_wqs Fenghua Yu
2025-03-09 6:20 ` [PATCH v3 2/9] dmaengine: idxd: fix memory leak in error handling path of idxd_setup_engines Shuai Xue
2025-03-09 6:20 ` [PATCH v3 3/9] dmaengine: idxd: fix memory leak in error handling path of idxd_setup_groups Shuai Xue
2025-04-02 23:24 ` Fenghua Yu
2025-03-09 6:20 ` [PATCH v3 4/9] dmaengine: idxd: Add missing cleanup for early error out in idxd_setup_internals Shuai Xue
2025-03-10 15:33 ` Dave Jiang
2025-04-02 23:26 ` Fenghua Yu
2025-04-04 11:47 ` Shuai Xue
2025-03-09 6:20 ` [PATCH v3 5/9] dmaengine: idxd: Add missing cleanups in cleanup internals Shuai Xue
2025-03-10 15:34 ` Dave Jiang
2025-04-02 23:27 ` Fenghua Yu
2025-03-09 6:20 ` [PATCH v3 6/9] dmaengine: idxd: fix memory leak in error handling path of idxd_alloc Shuai Xue
2025-04-02 23:31 ` Fenghua Yu
2025-03-09 6:20 ` Shuai Xue [this message]
2025-04-02 23:31 ` [PATCH v3 7/9] dmaengine: idxd: fix memory leak in error handling path of idxd_pci_probe Fenghua Yu
2025-03-09 6:20 ` [PATCH v3 8/9] dmaengine: idxd: Add missing idxd cleanup to fix memory leak in remove call Shuai Xue
2025-03-10 15:35 ` Dave Jiang
2025-04-02 23:31 ` Fenghua Yu
2025-03-09 6:20 ` [PATCH v3 9/9] dmaengine: idxd: Refactor remove call with idxd_cleanup() helper Shuai Xue
2025-03-10 15:36 ` Dave Jiang
2025-04-02 23:32 ` Fenghua Yu
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=20250309062058.58910-8-xueshuai@linux.alibaba.com \
--to=xueshuai@linux.alibaba.com \
--cc=Markus.Elfring@web.de \
--cc=dave.jiang@intel.com \
--cc=dmaengine@vger.kernel.org \
--cc=fenghuay@nvidia.com \
--cc=linux-kernel@vger.kernel.org \
--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