block/rnbd-clt: Fix possible memleak
authorJack Wang <jinpu.wang@cloud.ionos.com>
Thu, 10 Dec 2020 10:18:21 +0000 (11:18 +0100)
committerJens Axboe <axboe@kernel.dk>
Wed, 16 Dec 2020 21:55:44 +0000 (14:55 -0700)
In error case, we do not free the memory for blk_symlink_name.

Do it by free the memory in error case, and set to NULL
afterwards.

Also fix the condition in rnbd_clt_remove_dev_symlink.

Fixes: 64e8a6ece1a5 ("block/rnbd-clt: Dynamically alloc buffer for pathname & blk_symlink_name")
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>
drivers/block/rnbd/rnbd-clt-sysfs.c

index a7caeed..d4aa6bf 100644 (file)
@@ -432,7 +432,7 @@ void rnbd_clt_remove_dev_symlink(struct rnbd_clt_dev *dev)
         * i.e. rnbd_clt_unmap_dev_store() leading to a sysfs warning because
         * of sysfs link already was removed already.
         */
-       if (strlen(dev->blk_symlink_name) && try_module_get(THIS_MODULE)) {
+       if (dev->blk_symlink_name && try_module_get(THIS_MODULE)) {
                sysfs_remove_link(rnbd_devs_kobj, dev->blk_symlink_name);
                kfree(dev->blk_symlink_name);
                module_put(THIS_MODULE);
@@ -521,7 +521,8 @@ static int rnbd_clt_add_dev_symlink(struct rnbd_clt_dev *dev)
        return 0;
 
 out_err:
-       dev->blk_symlink_name[0] = '\0';
+       kfree(dev->blk_symlink_name);
+       dev->blk_symlink_name = NULL ;
        return ret;
 }