dm era: Fix bitset memory leaks

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>

diff --git a/drivers/md/dm-era-target.c b/drivers/md/dm-era-target.c
index 2d0e86f40b7e653072e4321bbe3cf88144804545..a499d6f0e7b9bddfed7159cf509ae2982bb82e0b 100644 (file)
--- 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_open(struct block_device *bdev,
 
 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_metadata *md, void *arg)
        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_metadata *md, void *arg)
                            &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;
        }