From: Sascha Hauer <s.hauer@pengutronix.de>
To: Zhihao Cheng <chengzhihao1@huawei.com>
Cc: richard@nod.at, linux-mtd@lists.infradead.org,
linux-kernel@vger.kernel.org, yi.zhang@huawei.com
Subject: Re: [PATCH 3/3] ubifs: mount_ubifs: Release authentication resource in error handling path
Date: Wed, 30 Sep 2020 08:44:21 +0200 [thread overview]
Message-ID: <20200930064421.GB11648@pengutronix.de> (raw)
In-Reply-To: <20200929124531.941873-3-chengzhihao1@huawei.com>
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 |
______________________________________________________
Linux MTD discussion mailing list
http://lists.infradead.org/mailman/listinfo/linux-mtd/
next prev parent reply other threads:[~2020-09-30 6:45 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-09-29 12:45 [PATCH 1/3] ubifs: Fix a memleak after dumping authentication mount options Zhihao Cheng
2020-09-29 12:45 ` [PATCH 2/3] ubifs: Don't parse authentication mount options in remount process Zhihao Cheng
2020-09-30 6:58 ` Sascha Hauer
2020-09-29 12:45 ` [PATCH 3/3] ubifs: mount_ubifs: Release authentication resource in error handling path Zhihao Cheng
2020-09-30 6:44 ` Sascha Hauer [this message]
2020-09-30 7:09 ` [PATCH 1/3] ubifs: Fix a memleak after dumping authentication mount options Sascha Hauer
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200930064421.GB11648@pengutronix.de \
--to=s.hauer@pengutronix.de \
--cc=chengzhihao1@huawei.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mtd@lists.infradead.org \
--cc=richard@nod.at \
--cc=yi.zhang@huawei.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).