openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

ubifs: mount_ubifs: Release authentication resource in error handling path 

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: d8a22773a1 ("ubifs: Enable authentication support")
Reviewed-by: Sascha Hauer <s.hauer@pengutronix.de>
Signed-off-by: Richard Weinberger <richard@nod.at>
This commit is contained in:
Zhihao Cheng 2020-09-29 20:45:31 +08:00 committed by Richard Weinberger
parent bb674a4d4d
commit e2a05cc7f8
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
fs/ubifs/super.c
View File

@ -1331,7 +1331,7 @@ static int mount_ubifs(struct ubifs_info *c)
err = ubifs_read_superblock(c); err = ubifs_read_superblock(c);
if (err) if (err)
goto out_free; goto out_auth;
c->probing = 0; c->probing = 0;
@ -1343,18 +1343,18 @@ static int mount_ubifs(struct ubifs_info *c)
ubifs_err(c, "'compressor \"%s\" is not compiled in", ubifs_err(c, "'compressor \"%s\" is not compiled in",
ubifs_compr_name(c, c->default_compr)); ubifs_compr_name(c, c->default_compr));
err = -ENOTSUPP; err = -ENOTSUPP;
goto out_free; goto out_auth;
} }
err = init_constants_sb(c); err = init_constants_sb(c);
if (err) if (err)
goto out_free; goto out_auth;
sz = ALIGN(c->max_idx_node_sz, c->min_io_size) * 2; sz = ALIGN(c->max_idx_node_sz, c->min_io_size) * 2;
c->cbuf = kmalloc(sz, GFP_NOFS); c->cbuf = kmalloc(sz, GFP_NOFS);
if (!c->cbuf) { if (!c->cbuf) {
err = -ENOMEM; err = -ENOMEM;
goto out_free; goto out_auth;
} }
err = alloc_wbufs(c); err = alloc_wbufs(c);
@ -1629,6 +1629,8 @@ static int mount_ubifs(struct ubifs_info *c)
free_wbufs(c); free_wbufs(c);
out_cbuf: out_cbuf:
kfree(c->cbuf); kfree(c->cbuf);
out_auth:
ubifs_exit_authentication(c);
out_free: out_free:
kfree(c->write_reserve_buf); kfree(c->write_reserve_buf);
kfree(c->bu.buf); kfree(c->bu.buf);