lkml.org 
[lkml]   [2020]   [Dec]   [22]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL 4.14 20/66] jfs: Fix memleak in dbAdjCtl
    Date
    From: Dinghao Liu <dinghao.liu@zju.edu.cn>

    [ Upstream commit 751341b4d7841e2b76e78eec382c2e119165497f ]

    When dbBackSplit() fails, mp should be released to
    prevent memleak. It's the same when dbJoin() fails.

    Signed-off-by: Dinghao Liu <dinghao.liu@zju.edu.cn>
    Signed-off-by: Dave Kleikamp <dave.kleikamp@oracle.com>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    fs/jfs/jfs_dmap.c | 8 ++++++--
    1 file changed, 6 insertions(+), 2 deletions(-)

    diff --git a/fs/jfs/jfs_dmap.c b/fs/jfs/jfs_dmap.c
    index 2d514c7affc2a..fa14a01950853 100644
    --- a/fs/jfs/jfs_dmap.c
    +++ b/fs/jfs/jfs_dmap.c
    @@ -2562,15 +2562,19 @@ dbAdjCtl(struct bmap * bmp, s64 blkno, int newval, int alloc, int level)
    */
    if (oldval == NOFREE) {
    rc = dbBackSplit((dmtree_t *) dcp, leafno);
    - if (rc)
    + if (rc) {
    + release_metapage(mp);
    return rc;
    + }
    oldval = dcp->stree[ti];
    }
    dbSplit((dmtree_t *) dcp, leafno, dcp->budmin, newval);
    } else {
    rc = dbJoin((dmtree_t *) dcp, leafno, newval);
    - if (rc)
    + if (rc) {
    + release_metapage(mp);
    return rc;
    + }
    }

    /* check if the root of the current dmap control page changed due
    --
    2.27.0
    \
     
     \ /
      Last update: 2020-12-23 03:42    [W:3.737 / U:0.332 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site