]> git.baikalelectronics.ru Git - kernel.git/commitdiff
fs: reiserfs: remove useless new_opts in reiserfs_remount
authorDongliang Mu <mudongliangabcd@gmail.com>
Wed, 27 Oct 2021 14:34:41 +0000 (22:34 +0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 6 Feb 2023 06:52:43 +0000 (07:52 +0100)
commit dc8a8d010be23cc4635b41da30be4171cb85f747 upstream.

Since the commit 6130f167d73b ("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: 6130f167d73b ("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>
fs/reiserfs/super.c

index 913f5af9bf248988d16cfa53973da58a041a7b2c..0ebb6e6849082f5838d45a9904c053a21d87120b 100644 (file)
@@ -1437,7 +1437,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;
@@ -1445,10 +1444,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);
 
@@ -1599,7 +1594,6 @@ out_ok_unlocked:
 out_err_unlock:
        reiserfs_write_unlock(s);
 out_err:
-       kfree(new_opts);
        return err;
 }