android/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

shmem: use ramfs_kill_sb() for kill_sb method of ramfs-based tmpfs

Browse Source 
commit 36ce9d76b0a93bae799e27e4f5ac35478c676592 upstream.

As the ramfs-based tmpfs uses ramfs_init_fs_context() for the
init_fs_context method, which allocates fc->s_fs_info, use ramfs_kill_sb()
to free it and avoid a memory leak.

Link: https://lkml.kernel.org/r/20230607161523.2876433-1-roberto.sassu@huaweicloud.com
Fixes: c3b1b1cbf0 ("ramfs: add support for "mode=" mount option")
Signed-off-by: Roberto Sassu <roberto.sassu@huawei.com>
Cc: Hugh Dickins <hughd@google.com>
Cc: David Howells <dhowells@redhat.com>
Cc: Al Viro <viro@zeniv.linux.org.uk>
Cc: <stable@vger.kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Roberto Sassu 2023-06-07 18:15:23 +02:00 committed by Greg Kroah-Hartman
parent 79bef379d5
commit 5fada37511
3 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fs/ramfs/inode.c
View File

@ -264,7 +264,7 @@ int ramfs_init_fs_context(struct fs_context *fc)
return 0; return 0;
} }
static void ramfs_kill_sb(struct super_block *sb) void ramfs_kill_sb(struct super_block *sb)
{ {
kfree(sb->s_fs_info); kfree(sb->s_fs_info);
kill_litter_super(sb); kill_litter_super(sb);

1
include/linux/ramfs.h
View File

@ -7,6 +7,7 @@
struct inode *ramfs_get_inode(struct super_block *sb, const struct inode *dir, struct inode *ramfs_get_inode(struct super_block *sb, const struct inode *dir,
umode_t mode, dev_t dev); umode_t mode, dev_t dev);
extern int ramfs_init_fs_context(struct fs_context *fc); extern int ramfs_init_fs_context(struct fs_context *fc);
extern void ramfs_kill_sb(struct super_block *sb);
#ifdef CONFIG_MMU #ifdef CONFIG_MMU
static inline int static inline int

2
mm/shmem.c
View File

@ -4128,7 +4128,7 @@ static struct file_system_type shmem_fs_type = {
.name = "tmpfs", .name = "tmpfs",
.init_fs_context = ramfs_init_fs_context, .init_fs_context = ramfs_init_fs_context,
.parameters = ramfs_fs_parameters, .parameters = ramfs_fs_parameters,
.kill_sb = kill_litter_super, .kill_sb = ramfs_kill_sb,
.fs_flags = FS_USERNS_MOUNT, .fs_flags = FS_USERNS_MOUNT,
}; };