block/rnbd: call kobject_put in the failure path

Per the comment of kobject_init_and_add, we need to cleanup the memory
by call kobject_put.

Also we need to call kobject_del for the other failure cases if the
kobject_init_and_add doesn't fail.

Signed-off-by: Guoqing Jiang <guoqing.jiang@cloud.ionos.com>
Signed-off-by: Jack Wang <jinpu.wang@cloud.ionos.com>
Reviewed-by: Md Haris Iqbal <haris.iqbal@cloud.ionos.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>

diff --git a/drivers/block/rnbd/rnbd-clt-sysfs.c b/drivers/block/rnbd/rnbd-clt-sysfs.c
index 5d3c3c80dab4afe3fd5f20997e9cc3705015e1ea..e3c3270b0cee9d5ccce254505d28473d242b9995 100644 (file)
--- a/drivers/block/rnbd/rnbd-clt-sysfs.c
+++ b/drivers/block/rnbd/rnbd-clt-sysfs.c
@@ -450,9 +450,11 @@ static int rnbd_clt_add_dev_kobj(struct rnbd_clt_dev *dev)
 
        ret = kobject_init_and_add(&dev->kobj, &rnbd_dev_ktype, gd_kobj, "%s",
                                   "rnbd");
-       if (ret)
+       if (ret) {
                rnbd_clt_err(dev, "Failed to create device sysfs dir, err: %d\n",
                              ret);
+               kobject_put(&dev->kobj);
+       }
 
        return ret;
 }

diff --git a/drivers/block/rnbd/rnbd-srv-sysfs.c b/drivers/block/rnbd/rnbd-srv-sysfs.c
index 08ffb492ebfac62fec5a85f70613b6a003c2755f..05ffe488ddc64e75c4dee8c6369aac84df2ae3c3 100644 (file)
--- a/drivers/block/rnbd/rnbd-srv-sysfs.c
+++ b/drivers/block/rnbd/rnbd-srv-sysfs.c
@@ -47,13 +47,17 @@ int rnbd_srv_create_dev_sysfs(struct rnbd_srv_dev *dev,
 
        ret = kobject_init_and_add(&dev->dev_kobj, &dev_ktype,
                                   rnbd_devs_kobj, dev_name);
-       if (ret)
+       if (ret) {
+               kobject_put(&dev->dev_kobj);
                return ret;
+       }
 
        dev->dev_sessions_kobj = kobject_create_and_add("sessions",
                                                        &dev->dev_kobj);
-       if (!dev->dev_sessions_kobj)
-               goto put_dev_kobj;
+       if (!dev->dev_sessions_kobj) {
+               ret = -ENOMEM;
+               goto free_dev_kobj;
+       }
 
        bdev_kobj = &disk_to_dev(bdev->bd_disk)->kobj;
        ret = sysfs_create_link(&dev->dev_kobj, bdev_kobj, "block_dev");
@@ -64,7 +68,8 @@ int rnbd_srv_create_dev_sysfs(struct rnbd_srv_dev *dev,
 
 put_sess_kobj:
        kobject_put(dev->dev_sessions_kobj);
-put_dev_kobj:
+free_dev_kobj:
+       kobject_del(&dev->dev_kobj);
        kobject_put(&dev->dev_kobj);
        return ret;
 }
@@ -196,18 +201,17 @@ int rnbd_srv_create_dev_session_sysfs(struct rnbd_srv_sess_dev *sess_dev)
        ret = kobject_init_and_add(&sess_dev->kobj, &rnbd_srv_sess_dev_ktype,
                                   sess_dev->dev->dev_sessions_kobj, "%s",
                                   sess_dev->sess->sessname);
-       if (ret)
+       if (ret) {
+               kobject_put(&sess_dev->kobj);
                return ret;
+       }
 
        ret = sysfs_create_group(&sess_dev->kobj,
                                 &rnbd_srv_default_dev_session_attr_group);
-       if (ret)
-               goto err;
-
-       return 0;
-
-err:
-       kobject_put(&sess_dev->kobj);
+       if (ret) {
+               kobject_del(&sess_dev->kobj);
+               kobject_put(&sess_dev->kobj);
+       }
 
        return ret;
 }