* [PATCH] nilfs2: Fix reference count leak in nilfs_sysfs_create_device_group
@ 2020-05-27 20:09 wu000273
2020-05-27 22:21 ` Ryusuke Konishi
0 siblings, 1 reply; 2+ messages in thread
From: wu000273 @ 2020-05-27 20:09 UTC (permalink / raw)
To: kjlu
Cc: wu000273, Ryusuke Konishi, Vyacheslav Dubeyko, Andrew Morton,
linux-nilfs, linux-kernel
From: Qiushi Wu <wu000273@umn.edu>
kobject_init_and_add() takes reference even when it fails.
In nilfs_sysfs_create_device_group(), the memory allocated by
kobject_init_and_add() is not freed when kobject_init_and_add()
fails. Thus replace the jump target "free_dev_subgroups" by
"cleanup_dev_kobject".
Fixes: da7141fb78db ("nilfs2: add /sys/fs/nilfs2/<device> group")
Signed-off-by: Qiushi Wu <wu000273@umn.edu>
---
fs/nilfs2/sysfs.c | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/fs/nilfs2/sysfs.c b/fs/nilfs2/sysfs.c
index e60be7bb55b0..4a74756d52fe 100644
--- a/fs/nilfs2/sysfs.c
+++ b/fs/nilfs2/sysfs.c
@@ -1000,7 +1000,7 @@ int nilfs_sysfs_create_device_group(struct super_block *sb)
err = kobject_init_and_add(&nilfs->ns_dev_kobj, &nilfs_dev_ktype, NULL,
"%s", sb->s_id);
if (err)
- goto free_dev_subgroups;
+ goto cleanup_dev_kobject;
err = nilfs_sysfs_create_mounted_snapshots_group(nilfs);
if (err)
@@ -1038,8 +1038,6 @@ int nilfs_sysfs_create_device_group(struct super_block *sb)
cleanup_dev_kobject:
kobject_del(&nilfs->ns_dev_kobj);
-
-free_dev_subgroups:
kfree(nilfs->ns_dev_subgroups);
failed_create_device_group:
--
2.17.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] nilfs2: Fix reference count leak in nilfs_sysfs_create_device_group
2020-05-27 20:09 [PATCH] nilfs2: Fix reference count leak in nilfs_sysfs_create_device_group wu000273
@ 2020-05-27 22:21 ` Ryusuke Konishi
0 siblings, 0 replies; 2+ messages in thread
From: Ryusuke Konishi @ 2020-05-27 22:21 UTC (permalink / raw)
To: wu000273; +Cc: kjlu, Vyacheslav Dubeyko, Andrew Morton, linux-nilfs, LKML
Qiushi Wu,
Can we call kobject_del() instead of kobject_put() when
kobject_init_and_add() failed ?
If it's unclear, I think we should fix this by
calling kobject_put() when kobject_init_and_add() fails, and
goto free_dev_subgroups.
Regards,
On Thu, May 28, 2020 at 5:10 AM <wu000273@umn.edu> wrote:
>
> From: Qiushi Wu <wu000273@umn.edu>
>
> kobject_init_and_add() takes reference even when it fails.
> In nilfs_sysfs_create_device_group(), the memory allocated by
> kobject_init_and_add() is not freed when kobject_init_and_add()
> fails. Thus replace the jump target "free_dev_subgroups" by
> "cleanup_dev_kobject".
>
> Fixes: da7141fb78db ("nilfs2: add /sys/fs/nilfs2/<device> group")
> Signed-off-by: Qiushi Wu <wu000273@umn.edu>
> ---
> fs/nilfs2/sysfs.c | 4 +---
> 1 file changed, 1 insertion(+), 3 deletions(-)
>
> diff --git a/fs/nilfs2/sysfs.c b/fs/nilfs2/sysfs.c
> index e60be7bb55b0..4a74756d52fe 100644
> --- a/fs/nilfs2/sysfs.c
> +++ b/fs/nilfs2/sysfs.c
> @@ -1000,7 +1000,7 @@ int nilfs_sysfs_create_device_group(struct super_block *sb)
> err = kobject_init_and_add(&nilfs->ns_dev_kobj, &nilfs_dev_ktype, NULL,
> "%s", sb->s_id);
> if (err)
> - goto free_dev_subgroups;
> + goto cleanup_dev_kobject;
>
> err = nilfs_sysfs_create_mounted_snapshots_group(nilfs);
> if (err)
> @@ -1038,8 +1038,6 @@ int nilfs_sysfs_create_device_group(struct super_block *sb)
>
> cleanup_dev_kobject:
> kobject_del(&nilfs->ns_dev_kobj);
> -
> -free_dev_subgroups:
> kfree(nilfs->ns_dev_subgroups);
>
> failed_create_device_group:
> --
> 2.17.1
>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2020-05-27 22:21 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-05-27 20:09 [PATCH] nilfs2: Fix reference count leak in nilfs_sysfs_create_device_group wu000273
2020-05-27 22:21 ` Ryusuke Konishi
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).