From: Keith Busch <kbusch@xxxxxxxxxx> If we fail to add the device, free the name allocated for it. Signed-off-by: Keith Busch <kbusch@xxxxxxxxxx> --- 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
