From: Keith Busch <kbusch@meta.com>
To: <linux-nvme@lists.infradead.org>, <linux-block@vger.kernel.org>,
<joshi.k@samsung.com>, <axboe@kernel.dk>, <hch@lst.de>,
<xiaoguang.wang@linux.alibaba.com>
Cc: Keith Busch <kbusch@kernel.org>
Subject: [RFC 2/3] nvme: fix cdev name leak
Date: Mon, 1 May 2023 08:33:05 -0700 [thread overview]
Message-ID: <20230501153306.537124-3-kbusch@meta.com> (raw)
In-Reply-To: <20230501153306.537124-1-kbusch@meta.com>
From: Keith Busch <kbusch@kernel.org>
If we fail to add the device, free the name allocated for it.
Signed-off-by: Keith Busch <kbusch@kernel.org>
---
drivers/nvme/host/core.c | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c
index 1bfd52eae2eeb..0f1cb6f418182 100644
--- a/drivers/nvme/host/core.c
+++ b/drivers/nvme/host/core.c
@@ -4079,8 +4079,16 @@ static int nvme_add_ns_cdev(struct nvme_ns *ns)
if (ret)
return ret;
- return nvme_cdev_add(&ns->cdev, &ns->cdev_device, &nvme_ns_chr_fops,
+ ret = nvme_cdev_add(&ns->cdev, &ns->cdev_device, &nvme_ns_chr_fops,
ns->ctrl->ops->module);
+ if (ret)
+ goto out_free_name;
+
+ return 0;
+
+out_free_name:
+ kfree_const(ns->cdev_device.kobj.name);
+ return ret;
}
static struct nvme_ns_head *nvme_alloc_ns_head(struct nvme_ctrl *ctrl,
--
2.34.1
next prev parent reply other threads:[~2023-05-01 15:33 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <CGME20230501154403epcas5p388c607114ad6f9d20dfd3ec958d88947@epcas5p3.samsung.com>
2023-05-01 15:33 ` [RFC 0/3] nvme uring passthrough diet Keith Busch
2023-05-01 15:33 ` [RFC 1/3] nvme: skip block cgroups for passthrough commands Keith Busch
2023-05-03 5:04 ` Christoph Hellwig
2023-05-03 15:25 ` Keith Busch
2023-05-15 15:47 ` Keith Busch
2023-05-01 15:33 ` Keith Busch [this message]
2023-05-01 15:33 ` [RFC 3/3] nvme: create special request queue for cdev Keith Busch
2023-05-02 12:20 ` Johannes Thumshirn
2023-05-03 5:04 ` Christoph Hellwig
2023-05-03 14:56 ` Keith Busch
2023-05-01 19:01 ` [RFC 0/3] nvme uring passthrough diet Kanchan Joshi
2023-05-01 19:31 ` Keith Busch
2023-05-03 7:27 ` Kanchan Joshi
2023-05-03 15:20 ` Keith Busch
2023-05-05 8:14 ` Kanchan Joshi
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=20230501153306.537124-3-kbusch@meta.com \
--to=kbusch@meta.com \
--cc=axboe@kernel.dk \
--cc=hch@lst.de \
--cc=joshi.k@samsung.com \
--cc=kbusch@kernel.org \
--cc=linux-block@vger.kernel.org \
--cc=linux-nvme@lists.infradead.org \
--cc=xiaoguang.wang@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