From: Shuai Xue <xueshuai@linux.alibaba.com>
To: fenghua.yu@intel.com, dave.jiang@intel.com, vkoul@kernel.org
Cc: xueshuai@linux.alibaba.com, dmaengine@vger.kernel.org,
linux-kernel@vger.kernel.org
Subject: [PATCH v1 5/5] dmaengine: idxd: fix memory leak in error handling path of idxd_pci_probe
Date: Fri, 10 Jan 2025 16:22:37 +0800 [thread overview]
Message-ID: <20250110082237.21135-6-xueshuai@linux.alibaba.com> (raw)
In-Reply-To: <20250110082237.21135-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.
Signed-off-by: Shuai Xue <xueshuai@linux.alibaba.com>
---
drivers/dma/idxd/init.c | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/drivers/dma/idxd/init.c b/drivers/dma/idxd/init.c
index f0e3244d630d..9b44f5d38d3a 100644
--- a/drivers/dma/idxd/init.c
+++ b/drivers/dma/idxd/init.c
@@ -548,6 +548,14 @@ 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)
+{
+ 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;
@@ -820,7 +828,7 @@ static int idxd_pci_probe(struct pci_dev *pdev, const struct pci_device_id *id)
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-01-10 8:22 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-01-10 8:22 [PATCH v1 0/5] dmaengine: idxd: fix memory leak in error handling path Shuai Xue
2025-01-10 8:22 ` [PATCH v1 1/5] dmaengine: idxd: fix memory leak in error handling path of idxd_setup_wqs Shuai Xue
2025-02-14 16:33 ` Dave Jiang
2025-01-10 8:22 ` [PATCH v1 2/5] dmaengine: idxd: fix memory leak in error handling path of idxd_setup_engines Shuai Xue
2025-02-14 16:35 ` Dave Jiang
2025-01-10 8:22 ` [PATCH v1 3/5] dmaengine: idxd: fix memory leak in error handling path of idxd_setup_groups Shuai Xue
2025-02-14 16:40 ` Dave Jiang
2025-01-10 8:22 ` [PATCH v1 4/5] dmaengine: idxd: fix memory leak in error handling path of idxd_alloc Shuai Xue
2025-02-14 16:59 ` Dave Jiang
2025-02-14 17:01 ` Dave Jiang
2025-02-15 2:04 ` Shuai Xue
2025-01-10 8:22 ` Shuai Xue [this message]
2025-02-14 23:41 ` [PATCH v1 5/5] dmaengine: idxd: fix memory leak in error handling path of idxd_pci_probe Vinicius Costa Gomes
2025-02-15 2:06 ` Shuai Xue
2025-02-14 6:43 ` [PATCH v1 0/5] dmaengine: idxd: fix memory leak in error handling path Shuai Xue
2025-02-14 16:17 ` Dave Jiang
2025-02-14 17:15 ` [PATCH " Markus Elfring
2025-02-14 17:22 ` Dave Jiang
2025-02-15 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=20250110082237.21135-6-xueshuai@linux.alibaba.com \
--to=xueshuai@linux.alibaba.com \
--cc=dave.jiang@intel.com \
--cc=dmaengine@vger.kernel.org \
--cc=fenghua.yu@intel.com \
--cc=linux-kernel@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 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®