ubifs: Don't parse authentication mount options in remount process

commit bb674a4d4de1032837fcbf860a63939e66f0b7ad upstream.

There is no need to dump authentication options while remounting,
because authentication initialization can only be doing once in
the first mount process. Dumping authentication mount options in
remount process may cause memory leak if UBIFS has already been
mounted with old authentication mount options.

Signed-off-by: Zhihao Cheng <chengzhihao1@huawei.com>
Cc: <stable@vger.kernel.org>  # 4.20+
Fixes: d8a22773a12c6d7 ("ubifs: Enable authentication support")
Reviewed-by: Sascha Hauer <s.hauer@pengutronix.de>
Signed-off-by: Richard Weinberger <richard@nod.at>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/fs/ubifs/super.c b/fs/ubifs/super.c
index 05ce40ee7d64d191420e322aeb79f2fce708764a..94ddb0ff1ad7daa0dc3131cfc9cd6cb8c187db05 100644 (file)
--- a/fs/ubifs/super.c
+++ b/fs/ubifs/super.c
@@ -1092,14 +1092,20 @@ static int ubifs_parse_options(struct ubifs_info *c, char *options,
                        break;
                }
                case Opt_auth_key:
-                       c->auth_key_name = kstrdup(args[0].from, GFP_KERNEL);
-                       if (!c->auth_key_name)
-                               return -ENOMEM;
+                       if (!is_remount) {
+                               c->auth_key_name = kstrdup(args[0].from,
+                                                               GFP_KERNEL);
+                               if (!c->auth_key_name)
+                                       return -ENOMEM;
+                       }
                        break;
                case Opt_auth_hash_name:
-                       c->auth_hash_name = kstrdup(args[0].from, GFP_KERNEL);
-                       if (!c->auth_hash_name)
-                               return -ENOMEM;
+                       if (!is_remount) {
+                               c->auth_hash_name = kstrdup(args[0].from,
+                                                               GFP_KERNEL);
+                               if (!c->auth_hash_name)
+                                       return -ENOMEM;
+                       }
                        break;
                case Opt_ignore:
                        break;