binderfs: rework superblock destruction
PATCH v2 1/1 binderfs: rework superblock destruction
From: Al Viro <[email protected]>
So far we relied on
.put_super = binderfs_put_super()
to destroy info we stashed in sb->s_fs_info. This gave us the required ordering between ->evict_inode() and sb->s_fs_info destruction.
But the current implementation of binderfs_fill_super() has a memory leak in the rare circumstance that d_make_root() fails because ->put_super() is only called when sb->s_root is initialized. Fix this by removing ->put_super() and simply do all that work in binderfs_kill_super().
--- drivers/android/binderfs.c | 30 +++++++++++++++++------------- 1 file changed, 17 insertions(+), 13 deletions(-)
drivers/android/binderfs.c +17 -13
@@ -340,22 +340,10 @@ static int binderfs_show_options(struct seq_file *seq, struct dentry *root)return 0 ; } -static void binderfs_put_super (struct super_block *sb) -{ -struct binderfs_info *info = sb->s_fs_info; - -if (info && info->ipc_ns) -put_ipc_ns (info->ipc_ns); - -kfree (info); - sb->s_fs_info =NULL ; -} -static const struct super_operations binderfs_super_ops = { .evict_inode = binderfs_evict_inode, .show_options = binderfs_show_options, .statfs = simple_statfs, - .put_super = binderfs_put_super, };static inline bool is_binderfs_control_device (const struct dentry *dentry)
@@ -785,11 +773,27 @@ static int binderfs_init_fs_context(struct fs_context *fc)return 0 ; } +static void binderfs_kill_super (struct super_block *sb) +{ +struct binderfs_info *info = sb->s_fs_info; + +/* +* During inode eviction struct binderfs_info is needed. +* So first wipe the super_block then free struct binderfs_info. +*/ +kill_litter_super (sb); + +if (info && info->ipc_ns) +put_ipc_ns (info->ipc_ns); + +kfree (info); +} +static struct file_system_type binder_fs_type = { .name ="binder" , .init_fs_context = binderfs_init_fs_context, .parameters = binderfs_fs_parameters, - .kill_sb = kill_litter_super, + .kill_sb = binderfs_kill_super, .fs_flags =FS_USERNS_MOUNT , };
base-commit: 1c23f9e627a7b412978b4e852793c5e3c3efc555
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerQuoted 12 lines · Christian Brauner
From: Al Viro <[email protected]>
So far we relied on
.put_super =binderfs_put_super()
to destroy info we stashed insb->s_fs_info. This gave us the required ordering between ->evict_inode() andsb->s_fs_infodestruction.But the current implementation of
binderfs_fill_super()has a memory leak in the rare circumstance thatd_make_root()fails because ->put_super() is only called whensb->s_rootis initialized. Fix this by removing ->put_super() and simply do all that work inbinderfs_kill_super().
Quoted 6 lines
Reported-by Dongliang Mu <[email protected]>Signed-off-by Al Viro <[email protected]>Signed-off-by Christian Brauner (Microsoft) <[email protected]>--- drivers/android/binderfs.c | 30 +++++++++++++++++------------- 1 file changed, 17 insertions(+), 13 deletions(-)
What changed from v1?
Quoted 13 lines · Greg Kroah-Hartman
Quoted 12 lines · Christian Brauner
From: Al Viro <[email protected]>
So far we relied on
.put_super =binderfs_put_super()
to destroy info we stashed insb->s_fs_info. This gave us the required ordering between ->evict_inode() andsb->s_fs_infodestruction.But the current implementation of
binderfs_fill_super()has a memory leak in the rare circumstance thatd_make_root()fails because ->put_super() is only called whensb->s_rootis initialized. Fix this by removing ->put_super() and simply do all that work inbinderfs_kill_super().
Quoted 8 lines
Quoted 6 lines
Reported-by Dongliang Mu <[email protected]>Signed-off-by Al Viro <[email protected]>Signed-off-by Christian Brauner (Microsoft) <[email protected]>--- drivers/android/binderfs.c | 30 +++++++++++++++++------------- 1 file changed, 17 insertions(+), 13 deletions(-)What changed from v1?
Ah, forgot to add:
/* v2 */
Christian Brauner (Microsoft) <[email protected]>:
- Call kill_litter_super() before sb->s_fs_info cleanup.