diff options
| author | Zhihao Cheng <chengzhihao1@huawei.com> | 2020-09-29 14:45:30 +0200 |
|---|---|---|
| committer | Richard Weinberger <richard@nod.at> | 2020-10-11 22:05:49 +0200 |
| commit | bb674a4d4de1032837fcbf860a63939e66f0b7ad (patch) | |
| tree | 4f9a45c58a77a720a30e1d9ed184a07164d76166 /fs/ubifs | |
| parent | ubifs: Fix a memleak after dumping authentication mount options (diff) | |
| download | linux-bb674a4d4de1032837fcbf860a63939e66f0b7ad.tar.xz linux-bb674a4d4de1032837fcbf860a63939e66f0b7ad.zip | |
ubifs: Don't parse authentication mount options in remount process
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>
Diffstat (limited to 'fs/ubifs')
| -rw-r--r-- | fs/ubifs/super.c | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/fs/ubifs/super.c b/fs/ubifs/super.c index 6f85cd618766..9796f5df2f7f 100644 --- a/fs/ubifs/super.c +++ b/fs/ubifs/super.c @@ -1110,14 +1110,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; |