]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
fs/ntfs3: Fix 'proc_info_root' leak when init ntfs failed
authorYe Bin <yebin10@huawei.com>
Fri, 11 Oct 2024 07:40:25 +0000 (15:40 +0800)
committerKonstantin Komarov <almaz.alexandrovich@paragon-software.com>
Wed, 5 Feb 2025 14:48:40 +0000 (17:48 +0300)
There's a issue as follows:
  proc_dir_entry 'fs/ntfs3' already registered
  WARNING: CPU: 3 PID: 9788 at fs/proc/generic.c:375 proc_register+0x418/0x590
  Modules linked in: ntfs3(E+)
  Call Trace:
   <TASK>
   _proc_mkdir+0x165/0x200
   init_ntfs_fs+0x36/0xf90 [ntfs3]
   do_one_initcall+0x115/0x6c0
   do_init_module+0x253/0x760
   load_module+0x55f2/0x6c80
   init_module_from_file+0xd2/0x130
   __x64_sys_finit_module+0xbf/0x130
   do_syscall_64+0x72/0x1c0

Above issue happens as missing destroy 'proc_info_root' when error
happens after create 'proc_info_root' in init_ntfs_fs().
So destroy 'proc_info_root' in error path in init_ntfs_fs().

Fixes: 7832e123490a ("fs/ntfs3: Add support /proc/fs/ntfs3/<dev>/volinfo and /proc/fs/ntfs3/<dev>/label")
Signed-off-by: Ye Bin <yebin10@huawei.com>
Signed-off-by: Konstantin Komarov <almaz.alexandrovich@paragon-software.com>
fs/ntfs3/super.c

index 66047cf0e6e816d9f17c3421cb5de69b92ef0a60..920a1ab47b631dc0a80366769d875da1af6cfb9e 100644 (file)
@@ -1885,7 +1885,7 @@ static int __init init_ntfs_fs(void)
 
        err = ntfs3_init_bitmap();
        if (err)
-               return err;
+               goto out2;
 
        ntfs_inode_cachep = kmem_cache_create(
                "ntfs_inode_cache", sizeof(struct ntfs_inode), 0,
@@ -1905,6 +1905,8 @@ out:
        kmem_cache_destroy(ntfs_inode_cachep);
 out1:
        ntfs3_exit_bitmap();
+out2:
+       ntfs_remove_proc_root();
        return err;
 }