Messages in this thread | | | Date | Wed, 30 Sep 2020 08:44:21 +0200 | From | Sascha Hauer <> | Subject | Re: [PATCH 3/3] ubifs: mount_ubifs: Release authentication resource in error handling path |
| |
On Tue, Sep 29, 2020 at 08:45:31PM +0800, Zhihao Cheng wrote: > 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>
> --- > fs/ubifs/super.c | 10 ++++++---- > 1 file changed, 6 insertions(+), 4 deletions(-) > > diff --git a/fs/ubifs/super.c b/fs/ubifs/super.c > index 9796f5df2f7f..732218ef6656 100644 > --- a/fs/ubifs/super.c > +++ b/fs/ubifs/super.c > @@ -1331,7 +1331,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; > > @@ -1343,18 +1343,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); > @@ -1629,6 +1629,8 @@ static int mount_ubifs(struct ubifs_info *c) > 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); > -- > 2.25.4 > >
-- Pengutronix e.K. | | Steuerwalder Str. 21 | http://www.pengutronix.de/ | 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
| |