lkml.org 
[lkml]   [2020]   [Nov]   [3]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.9 308/391] ubifs: mount_ubifs: Release authentication resource in error handling path
    Date
    From: Zhihao Cheng <chengzhihao1@huawei.com>

    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>

    ---
    fs/ubifs/super.c | 10 ++++++----
    1 file changed, 6 insertions(+), 4 deletions(-)

    --- a/fs/ubifs/super.c
    +++ b/fs/ubifs/super.c
    @@ -1331,7 +1331,7 @@ static int mount_ubifs(struct ubifs_info

    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
    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 @@ 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);

    \
     
     \ /
      Last update: 2020-11-03 21:51    [W:4.135 / U:0.008 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site