lkml.org 
[lkml]   [2021]   [Mar]   [1]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.4 88/93] dm era: Fix bitset memory leaks
    Date
    From: Nikos Tsironis <ntsironis@arrikto.com>

    commit 904e6b266619c2da5c58b5dce14ae30629e39645 upstream.

    Deallocate the memory allocated for the in-core bitsets when destroying
    the target and in error paths.

    Fixes: eec40579d84873 ("dm: add era target")
    Cc: stable@vger.kernel.org # v3.15+
    Signed-off-by: Nikos Tsironis <ntsironis@arrikto.com>
    Reviewed-by: Ming-Hung Tsai <mtsai@redhat.com>
    Signed-off-by: Mike Snitzer <snitzer@redhat.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    drivers/md/dm-era-target.c | 6 ++++++
    1 file changed, 6 insertions(+)

    --- a/drivers/md/dm-era-target.c
    +++ b/drivers/md/dm-era-target.c
    @@ -46,6 +46,7 @@ struct writeset {
    static void writeset_free(struct writeset *ws)
    {
    vfree(ws->bits);
    + ws->bits = NULL;
    }

    static int setup_on_disk_bitset(struct dm_disk_bitset *info,
    @@ -812,6 +813,8 @@ static struct era_metadata *metadata_ope

    static void metadata_close(struct era_metadata *md)
    {
    + writeset_free(&md->writesets[0]);
    + writeset_free(&md->writesets[1]);
    destroy_persistent_data_objects(md);
    kfree(md);
    }
    @@ -849,6 +852,7 @@ static int metadata_resize(struct era_me
    r = writeset_alloc(&md->writesets[1], *new_size);
    if (r) {
    DMERR("%s: writeset_alloc failed for writeset 1", __func__);
    + writeset_free(&md->writesets[0]);
    return r;
    }

    @@ -859,6 +863,8 @@ static int metadata_resize(struct era_me
    &value, &md->era_array_root);
    if (r) {
    DMERR("%s: dm_array_resize failed", __func__);
    + writeset_free(&md->writesets[0]);
    + writeset_free(&md->writesets[1]);
    return r;
    }


    \
     
     \ /
      Last update: 2021-03-01 18:15    [W:4.552 / U:0.336 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site