Commit 47f6d9ce authored by Zhihao Cheng's avatar Zhihao Cheng Committed by Richard Weinberger

ubifs: Fix a memleak after dumping authentication mount options

Fix a memory leak after dumping authentication mount options in error
handling branch.
Signed-off-by: default avatarZhihao Cheng <chengzhihao1@huawei.com>
Cc: <stable@vger.kernel.org>  # 4.20+
Fixes: d8a22773 ("ubifs: Enable authentication support")
Reviewed-by: default avatarSascha Hauer <s.hauer@pengutronix.de>
Signed-off-by: default avatarRichard Weinberger <richard@nod.at>
parent b30e2238
...@@ -1141,6 +1141,18 @@ static int ubifs_parse_options(struct ubifs_info *c, char *options, ...@@ -1141,6 +1141,18 @@ static int ubifs_parse_options(struct ubifs_info *c, char *options,
return 0; return 0;
} }
/*
* ubifs_release_options - release mount parameters which have been dumped.
* @c: UBIFS file-system description object
*/
static void ubifs_release_options(struct ubifs_info *c)
{
kfree(c->auth_key_name);
c->auth_key_name = NULL;
kfree(c->auth_hash_name);
c->auth_hash_name = NULL;
}
/** /**
* destroy_journal - destroy journal data structures. * destroy_journal - destroy journal data structures.
* @c: UBIFS file-system description object * @c: UBIFS file-system description object
...@@ -1650,8 +1662,7 @@ static void ubifs_umount(struct ubifs_info *c) ...@@ -1650,8 +1662,7 @@ static void ubifs_umount(struct ubifs_info *c)
ubifs_lpt_free(c, 0); ubifs_lpt_free(c, 0);
ubifs_exit_authentication(c); ubifs_exit_authentication(c);
kfree(c->auth_key_name); ubifs_release_options(c);
kfree(c->auth_hash_name);
kfree(c->cbuf); kfree(c->cbuf);
kfree(c->rcvrd_mst_node); kfree(c->rcvrd_mst_node);
kfree(c->mst_node); kfree(c->mst_node);
...@@ -2219,6 +2230,7 @@ static int ubifs_fill_super(struct super_block *sb, void *data, int silent) ...@@ -2219,6 +2230,7 @@ static int ubifs_fill_super(struct super_block *sb, void *data, int silent)
out_unlock: out_unlock:
mutex_unlock(&c->umount_mutex); mutex_unlock(&c->umount_mutex);
out_close: out_close:
ubifs_release_options(c);
ubi_close_volume(c->ubi); ubi_close_volume(c->ubi);
out: out:
return err; return err;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment