]> www.infradead.org Git - users/dwmw2/linux.git/commitdiff
nilfs2: fix memory leak in nilfs_sysfs_create_snapshot_group
authorNanyong Sun <sunnanyong@huawei.com>
Wed, 8 Sep 2021 03:00:21 +0000 (20:00 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sun, 26 Sep 2021 11:39:49 +0000 (13:39 +0200)
[ Upstream commit b2fe39c248f3fa4bbb2a20759b4fdd83504190f7 ]

If kobject_init_and_add returns with error, kobject_put() is needed here
to avoid memory leak, because kobject_init_and_add may return error
without freeing the memory associated with the kobject it allocated.

Link: https://lkml.kernel.org/r/20210629022556.3985106-6-sunnanyong@huawei.com
Link: https://lkml.kernel.org/r/1625651306-10829-6-git-send-email-konishi.ryusuke@gmail.com
Signed-off-by: Nanyong Sun <sunnanyong@huawei.com>
Signed-off-by: Ryusuke Konishi <konishi.ryusuke@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
fs/nilfs2/sysfs.c

index 195f42192a1502ad95b331a701bb767cee92cf21..6c92ac314b0667d060e07c6e16910c4a32767b65 100644 (file)
@@ -208,9 +208,9 @@ int nilfs_sysfs_create_snapshot_group(struct nilfs_root *root)
        }
 
        if (err)
-               return err;
+               kobject_put(&root->snapshot_kobj);
 
-       return 0;
+       return err;
 }
 
 void nilfs_sysfs_delete_snapshot_group(struct nilfs_root *root)