mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-28 13:22:57 +00:00
fs: reiserfs: remove useless new_opts in reiserfs_remount
commit81dedaf10c
upstream. Since the commitc3d98ea082
("VFS: Don't use save/replace_mount_options if not using generic_show_options") eliminates replace_mount_options in reiserfs_remount, but does not handle the allocated new_opts, it will cause memory leak in the reiserfs_remount. Because new_opts is useless in reiserfs_mount, so we fix this bug by removing the useless new_opts in reiserfs_remount. Fixes:c3d98ea082
("VFS: Don't use save/replace_mount_options if not using generic_show_options") Link: https://lore.kernel.org/r/20211027143445.4156459-1-mudongliangabcd@gmail.com Signed-off-by: Dongliang Mu <mudongliangabcd@gmail.com> Signed-off-by: Jan Kara <jack@suse.cz> Signed-off-by: Fedor Pchelkin <pchelkin@ispras.ru> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
411459bb1f
commit
b8d6a58212
1 changed files with 0 additions and 6 deletions
|
@ -1443,7 +1443,6 @@ static int reiserfs_remount(struct super_block *s, int *mount_flags, char *arg)
|
|||
unsigned long safe_mask = 0;
|
||||
unsigned int commit_max_age = (unsigned int)-1;
|
||||
struct reiserfs_journal *journal = SB_JOURNAL(s);
|
||||
char *new_opts;
|
||||
int err;
|
||||
char *qf_names[REISERFS_MAXQUOTAS];
|
||||
unsigned int qfmt = 0;
|
||||
|
@ -1451,10 +1450,6 @@ static int reiserfs_remount(struct super_block *s, int *mount_flags, char *arg)
|
|||
int i;
|
||||
#endif
|
||||
|
||||
new_opts = kstrdup(arg, GFP_KERNEL);
|
||||
if (arg && !new_opts)
|
||||
return -ENOMEM;
|
||||
|
||||
sync_filesystem(s);
|
||||
reiserfs_write_lock(s);
|
||||
|
||||
|
@ -1605,7 +1600,6 @@ static int reiserfs_remount(struct super_block *s, int *mount_flags, char *arg)
|
|||
out_err_unlock:
|
||||
reiserfs_write_unlock(s);
|
||||
out_err:
|
||||
kfree(new_opts);
|
||||
return err;
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue