Commit eab09824 authored by Guoqing Jiang's avatar Guoqing Jiang Committed by Jason Gunthorpe

RDMA/rtrs-clt: Refactor the failure cases in alloc_clt

Make all failure cases go to the common path to avoid duplicate code.
And some issued existed before.

1. clt need to be freed to avoid memory leak.

2. return ERR_PTR(-ENOMEM) if kobject_create_and_add fails, because
   rtrs_clt_open checks the return value of by call "IS_ERR(clt)".

Fixes: 6a98d71d ("RDMA/rtrs: client: main functionality")
Link: https://lore.kernel.org/r/20201217141915.56989-15-jinpu.wang@cloud.ionos.comSigned-off-by: default avatarGuoqing Jiang <guoqing.jiang@cloud.ionos.com>
Reviewed-by: default avatarMd Haris Iqbal <haris.iqbal@cloud.ionos.com>
Signed-off-by: default avatarJack Wang <jinpu.wang@cloud.ionos.com>
Signed-off-by: default avatarJason Gunthorpe <jgg@nvidia.com>
parent 8537f2de
...@@ -2568,11 +2568,8 @@ static struct rtrs_clt *alloc_clt(const char *sessname, size_t paths_num, ...@@ -2568,11 +2568,8 @@ static struct rtrs_clt *alloc_clt(const char *sessname, size_t paths_num,
clt->dev.class = rtrs_clt_dev_class; clt->dev.class = rtrs_clt_dev_class;
clt->dev.release = rtrs_clt_dev_release; clt->dev.release = rtrs_clt_dev_release;
err = dev_set_name(&clt->dev, "%s", sessname); err = dev_set_name(&clt->dev, "%s", sessname);
if (err) { if (err)
free_percpu(clt->pcpu_path); goto err;
kfree(clt);
return ERR_PTR(err);
}
/* /*
* Suppress user space notification until * Suppress user space notification until
* sysfs files are created * sysfs files are created
...@@ -2580,29 +2577,31 @@ static struct rtrs_clt *alloc_clt(const char *sessname, size_t paths_num, ...@@ -2580,29 +2577,31 @@ static struct rtrs_clt *alloc_clt(const char *sessname, size_t paths_num,
dev_set_uevent_suppress(&clt->dev, true); dev_set_uevent_suppress(&clt->dev, true);
err = device_register(&clt->dev); err = device_register(&clt->dev);
if (err) { if (err) {
free_percpu(clt->pcpu_path);
put_device(&clt->dev); put_device(&clt->dev);
return ERR_PTR(err); goto err;
} }
clt->kobj_paths = kobject_create_and_add("paths", &clt->dev.kobj); clt->kobj_paths = kobject_create_and_add("paths", &clt->dev.kobj);
if (!clt->kobj_paths) { if (!clt->kobj_paths) {
free_percpu(clt->pcpu_path); err = -ENOMEM;
device_unregister(&clt->dev); goto err_dev;
return NULL;
} }
err = rtrs_clt_create_sysfs_root_files(clt); err = rtrs_clt_create_sysfs_root_files(clt);
if (err) { if (err) {
free_percpu(clt->pcpu_path);
kobject_del(clt->kobj_paths); kobject_del(clt->kobj_paths);
kobject_put(clt->kobj_paths); kobject_put(clt->kobj_paths);
device_unregister(&clt->dev); goto err_dev;
return ERR_PTR(err);
} }
dev_set_uevent_suppress(&clt->dev, false); dev_set_uevent_suppress(&clt->dev, false);
kobject_uevent(&clt->dev.kobj, KOBJ_ADD); kobject_uevent(&clt->dev.kobj, KOBJ_ADD);
return clt; return clt;
err_dev:
device_unregister(&clt->dev);
err:
free_percpu(clt->pcpu_path);
kfree(clt);
return ERR_PTR(err);
} }
static void free_clt(struct rtrs_clt *clt) static void free_clt(struct rtrs_clt *clt)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment