From: Dave Jiang <dave.jiang@intel.com>
To: Shuai Xue <xueshuai@linux.alibaba.com>,
vkoul@kernel.org, Vinicius Costa Gomes <vinicius.gomes@intel.com>
Cc: dmaengine@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: [PATCH v1 4/5] dmaengine: idxd: fix memory leak in error handling path of idxd_alloc
Date: Fri, 14 Feb 2025 09:59:03 -0700 [thread overview]
Message-ID: <cbe17c26-7631-494f-83d8-ff50481093ec@intel.com> (raw)
In-Reply-To: <20250110082237.21135-5-xueshuai@linux.alibaba.com>
On 1/10/25 1:22 AM, Shuai Xue wrote:
> Memory allocated for idxd is not freed if an error occurs during
> idxd_alloc(). 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>
Reviewed-by: Dave Jiang <dave.jiang@intel.com>
> ---
> drivers/dma/idxd/init.c | 24 +++++++++++++++---------
> 1 file changed, 15 insertions(+), 9 deletions(-)
>
> diff --git a/drivers/dma/idxd/init.c b/drivers/dma/idxd/init.c
> index 04a7d7706e53..f0e3244d630d 100644
> --- a/drivers/dma/idxd/init.c
> +++ b/drivers/dma/idxd/init.c
> @@ -565,28 +565,34 @@ static struct idxd_device *idxd_alloc(struct pci_dev *pdev, struct idxd_driver_d
> idxd_dev_set_type(&idxd->idxd_dev, idxd->data->type);
> idxd->id = ida_alloc(&idxd_ida, GFP_KERNEL);
> if (idxd->id < 0)
> - return NULL;
> + goto err_ida;
>
> idxd->opcap_bmap = bitmap_zalloc_node(IDXD_MAX_OPCAP_BITS, GFP_KERNEL, dev_to_node(dev));
> - if (!idxd->opcap_bmap) {
> - ida_free(&idxd_ida, idxd->id);
> - return NULL;
> - }
> + if (!idxd->opcap_bmap)
> + goto err_opcap;
>
> device_initialize(conf_dev);
> conf_dev->parent = dev;
> conf_dev->bus = &dsa_bus_type;
> conf_dev->type = idxd->data->dev_type;
> rc = dev_set_name(conf_dev, "%s%d", idxd->data->name_prefix, idxd->id);
> - if (rc < 0) {
> - put_device(conf_dev);
> - return NULL;
> - }
> + if (rc < 0)
> + goto err_name;
>
> spin_lock_init(&idxd->dev_lock);
> spin_lock_init(&idxd->cmd_lock);
>
> return idxd;
> +
> +err_name:
> + put_device(conf_dev);
> + bitmap_free(idxd->opcap_bmap);
> +err_opcap:
> + ida_free(&idxd_ida, idxd->id);
> +err_ida:
> + kfree(idxd);
> +
> + return NULL;
> }
>
> static int idxd_enable_system_pasid(struct idxd_device *idxd)
next prev parent reply other threads:[~2025-02-14 17:00 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 [this message]
2025-02-14 17:01 ` Dave Jiang
2025-02-15 2:04 ` Shuai Xue
2025-01-10 8:22 ` [PATCH v1 5/5] dmaengine: idxd: fix memory leak in error handling path of idxd_pci_probe Shuai Xue
2025-02-14 23:41 ` 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=cbe17c26-7631-494f-83d8-ff50481093ec@intel.com \
--to=dave.jiang@intel.com \
--cc=dmaengine@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=vinicius.gomes@intel.com \
--cc=vkoul@kernel.org \
--cc=xueshuai@linux.alibaba.com \
/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