The patch below does not apply to the 4.14-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <stable@xxxxxxxxxxxxxxx>. To reproduce the conflict and resubmit, you may use the following commands: git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-4.14.y git checkout FETCH_HEAD git cherry-pick -x 36ce9d76b0a93bae799e27e4f5ac35478c676592 # <resolve conflicts, build, test, etc.> git commit -s git send-email --to '<stable@xxxxxxxxxxxxxxx>' --in-reply-to '2023071640-facedown-shrine-ada1@gregkh' --subject-prefix 'PATCH 4.14.y' HEAD^.. Possible dependencies: 36ce9d76b0a9 ("shmem: use ramfs_kill_sb() for kill_sb method of ramfs-based tmpfs") d7167b149943 ("fs_parse: fold fs_parameter_desc/fs_parameter_spec") 96cafb9ccb15 ("fs_parser: remove fs_parameter_description name field") cc3c0b533ab9 ("add prefix to fs_context->log") c80c98f0dc5d ("ceph_parse_param(), ceph_parse_mon_ips(): switch to passing fc_log") 7f5d38141e30 ("new primitive: __fs_parse()") 2c3f3dc31556 ("switch rbd and libceph to p_log-based primitives") 3fbb8d5554a1 ("struct p_log, variants of warnf() et.al. taking that one instead") 9f09f649ca33 ("teach logfc() to handle prefices, give it saner calling conventions") 5eede625297f ("fold struct fs_parameter_enum into struct constant_table") 2710c957a8ef ("fs_parse: get rid of ->enums") 0f89589a8c6f ("Pass consistent param->type to fs_parse()") f2aedb713c28 ("NFS: Add fs_context support.") e38bb238ed8c ("NFS: Convert mount option parsing to use functionality from fs_parser.h") e558100fda7e ("NFS: Do some tidying of the parsing code") 48be8a66cf98 ("NFS: Add a small buffer in nfs_fs_context to avoid string dup") cbd071b5daa0 ("NFS: Deindent nfs_fs_context_parse_option()") f8ee01e3e2c8 ("NFS: Split nfs_parse_mount_options()") 5eb005caf538 ("NFS: Rename struct nfs_parsed_mount_data to struct nfs_fs_context") e0a626b12474 ("NFS: Constify mount argument match tables") thanks, greg k-h ------------------ original commit in Linus's tree ------------------ >From 36ce9d76b0a93bae799e27e4f5ac35478c676592 Mon Sep 17 00:00:00 2001 From: Roberto Sassu <roberto.sassu@xxxxxxxxxx> Date: Wed, 7 Jun 2023 18:15:23 +0200 Subject: [PATCH] shmem: use ramfs_kill_sb() for kill_sb method of ramfs-based tmpfs 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@xxxxxxxxxxxxxxx Fixes: c3b1b1cbf002 ("ramfs: add support for "mode=" mount option") Signed-off-by: Roberto Sassu <roberto.sassu@xxxxxxxxxx> Cc: Hugh Dickins <hughd@xxxxxxxxxx> Cc: David Howells <dhowells@xxxxxxxxxx> Cc: Al Viro <viro@xxxxxxxxxxxxxxxxxx> Cc: <stable@xxxxxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> diff --git a/fs/ramfs/inode.c b/fs/ramfs/inode.c index 5ba580c78835..fef477c78107 100644 --- a/fs/ramfs/inode.c +++ b/fs/ramfs/inode.c @@ -278,7 +278,7 @@ int ramfs_init_fs_context(struct fs_context *fc) return 0; } -static void ramfs_kill_sb(struct super_block *sb) +void ramfs_kill_sb(struct super_block *sb) { kfree(sb->s_fs_info); kill_litter_super(sb); diff --git a/include/linux/ramfs.h b/include/linux/ramfs.h index 917528d102c4..d506dc63dd47 100644 --- a/include/linux/ramfs.h +++ b/include/linux/ramfs.h @@ -7,6 +7,7 @@ struct inode *ramfs_get_inode(struct super_block *sb, const struct inode *dir, umode_t mode, dev_t dev); extern int ramfs_init_fs_context(struct fs_context *fc); +extern void ramfs_kill_sb(struct super_block *sb); #ifdef CONFIG_MMU static inline int diff --git a/mm/shmem.c b/mm/shmem.c index 5e54ab5f61f2..c606ab89693a 100644 --- a/mm/shmem.c +++ b/mm/shmem.c @@ -4199,7 +4199,7 @@ static struct file_system_type shmem_fs_type = { .name = "tmpfs", .init_fs_context = ramfs_init_fs_context, .parameters = ramfs_fs_parameters, - .kill_sb = kill_litter_super, + .kill_sb = ramfs_kill_sb, .fs_flags = FS_USERNS_MOUNT, };
