diff options
author | Zhihao Cheng <chengzhihao1@huawei.com> | 2020-09-29 20:45:31 +0800 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-11-05 11:43:32 +0100 |
commit | a99cbd20a5c511ad7b1b96730bc87fcba80e21d1 (patch) | |
tree | 968549b70b5f7cbcd36b7e9bd12f0bab4a7e648c | |
parent | 9ba6324ca9c4a1f4fc24c3620ae41fc10239a4cf (diff) | |
download | linux-stable-a99cbd20a5c511ad7b1b96730bc87fcba80e21d1.tar.gz linux-stable-a99cbd20a5c511ad7b1b96730bc87fcba80e21d1.tar.bz2 linux-stable-a99cbd20a5c511ad7b1b96730bc87fcba80e21d1.zip |
ubifs: mount_ubifs: Release authentication resource in error handling path
commit e2a05cc7f8229e150243cdae40f2af9021d67a4a upstream.
Release the authentication related resource in some error handling
branches in mount_ubifs().
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>
-rw-r--r-- | fs/ubifs/super.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/fs/ubifs/super.c b/fs/ubifs/super.c index 94ddb0ff1ad7..e49bd69dfc1c 100644 --- a/fs/ubifs/super.c +++ b/fs/ubifs/super.c @@ -1313,7 +1313,7 @@ static int mount_ubifs(struct ubifs_info *c) err = ubifs_read_superblock(c); if (err) - goto out_free; + goto out_auth; c->probing = 0; @@ -1325,18 +1325,18 @@ static int mount_ubifs(struct ubifs_info *c) ubifs_err(c, "'compressor \"%s\" is not compiled in", ubifs_compr_name(c, c->default_compr)); err = -ENOTSUPP; - goto out_free; + goto out_auth; } err = init_constants_sb(c); if (err) - goto out_free; + goto out_auth; sz = ALIGN(c->max_idx_node_sz, c->min_io_size) * 2; c->cbuf = kmalloc(sz, GFP_NOFS); if (!c->cbuf) { err = -ENOMEM; - goto out_free; + goto out_auth; } err = alloc_wbufs(c); @@ -1611,6 +1611,8 @@ out_wbufs: free_wbufs(c); out_cbuf: kfree(c->cbuf); +out_auth: + ubifs_exit_authentication(c); out_free: kfree(c->write_reserve_buf); kfree(c->bu.buf); |