Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8eb5a680 authored by Dongliang Mu's avatar Dongliang Mu Committed by Greg Kroah-Hartman
Browse files

fs: reiserfs: remove useless new_opts in reiserfs_remount 

commit 81dedaf10c20959bdf5624f9783f408df26ba7a4 upstream.

Since the commit c3d98ea0 ("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: c3d98ea0 ("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: default avatarDongliang Mu <mudongliangabcd@gmail.com>
Signed-off-by: default avatarJan Kara <jack@suse.cz>
Signed-off-by: default avatarFedor Pchelkin <pchelkin@ispras.ru>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent a61bc919

fs/reiserfs/super.c

+0 −6
Original line number Original line Diff line number Diff line
@@ -1437,7 +1437,6 @@ static int reiserfs_remount(struct super_block *s, int *mount_flags, char *arg) 
	unsigned long safe_mask = 0;

	unsigned long safe_mask = 0;

	unsigned int commit_max_age = (unsigned int)-1;

	unsigned int commit_max_age = (unsigned int)-1;

	struct reiserfs_journal *journal = SB_JOURNAL(s);

	struct reiserfs_journal *journal = SB_JOURNAL(s);

	char *new_opts;

	int err;

	int err;

	char *qf_names[REISERFS_MAXQUOTAS];

	char *qf_names[REISERFS_MAXQUOTAS];

	unsigned int qfmt = 0;

	unsigned int qfmt = 0;
@@ -1445,10 +1444,6 @@ static int reiserfs_remount(struct super_block *s, int *mount_flags, char *arg) 
	int i;

	int i;

#endif

#endif





	new_opts = kstrdup(arg, GFP_KERNEL);

	if (arg && !new_opts)

		return -ENOMEM;



	sync_filesystem(s);

	sync_filesystem(s);

	reiserfs_write_lock(s);

	reiserfs_write_lock(s);
@@ -1599,7 +1594,6 @@ static int reiserfs_remount(struct super_block *s, int *mount_flags, char *arg) 
out_err_unlock:

out_err_unlock:

	reiserfs_write_unlock(s);

	reiserfs_write_unlock(s);

out_err:

out_err:

	kfree(new_opts);

	return err;

	return err;

}

}