Commit 80fa3341 authored by Kevin Wolf's avatar Kevin Wolf
Browse files

qcow2: Fix memory leaks in error cases 



This fixes memory leaks that may be caused by I/O errors during L1 table growth
(can happen during save_vm) and in qemu-img check.

Signed-off-by: default avatarKevin Wolf <kwolf@redhat.com>
parent 30cdc48c

block/qcow2-cluster.c

+1 −1
Original line number Diff line number Diff line
@@ -70,7 +70,7 @@ int qcow2_grow_l1_table(BlockDriverState *bs, int min_size, bool exact_size) 


    ret = qcow2_cache_flush(bs, s->refcount_block_cache);

    if (ret < 0) {

        return ret;

        goto fail;

    }



    BLKDBG_EVENT(bs->file, BLKDBG_L1_GROW_WRITE_TABLE);

block/qcow2-refcount.c

+6 −3
Original line number Diff line number Diff line
@@ -1086,7 +1086,7 @@ int qcow2_check_refcounts(BlockDriverState *bs, BdrvCheckResult *res) 
    ret = check_refcounts_l1(bs, res, refcount_table, nb_clusters,

                       s->l1_table_offset, s->l1_size, 1);

    if (ret < 0) {

        return ret;

        goto fail;

    }



    /* snapshots */
@@ -1095,7 +1095,7 @@ int qcow2_check_refcounts(BlockDriverState *bs, BdrvCheckResult *res) 
        ret = check_refcounts_l1(bs, res, refcount_table, nb_clusters,

            sn->l1_table_offset, sn->l1_size, 0);

        if (ret < 0) {

            return ret;

            goto fail;

        }

    }

    inc_refcounts(bs, res, refcount_table, nb_clusters,
@@ -1159,8 +1159,11 @@ int qcow2_check_refcounts(BlockDriverState *bs, BdrvCheckResult *res) 
        }

    }



    ret = 0;



fail:

    qemu_free(refcount_table);



    return 0;

    return ret;

}