Commit ff52aab2 authored by Max Reitz's avatar Max Reitz Committed by Kevin Wolf
Browse files

qcow2: Catch !*host_offset for data allocation 



qcow2_alloc_cluster_offset() uses host_offset == 0 as "no preferred
offset" for the (data) cluster range to be allocated. However, this
offset is actually valid and may be allocated on images with a corrupted
refcount table or first refcount block.

In this case, the corruption prevention should normally catch that
write anyway (because it would overwrite the image header). But since 0
is a special value here, the function assumes that nothing has been
allocated at all which it asserts against.

Because this condition is not qemu's fault but rather that of a broken
image, it shouldn't throw an assertion but rather mark the image corrupt
and show an appropriate message, which this patch does by calling the
corruption check earlier than it would be called normally (before the
assertion).

Signed-off-by: default avatarMax Reitz <mreitz@redhat.com>
Reviewed-by: default avatarEric Blake <eblake@redhat.com>
Signed-off-by: default avatarKevin Wolf <kwolf@redhat.com>
parent 8fcffa98

block/qcow2-cluster.c

+11 −0
Original line number Diff line number Diff line
@@ -1119,6 +1119,17 @@ static int handle_alloc(BlockDriverState *bs, uint64_t guest_offset, 
        return 0;

    }



    /* !*host_offset would overwrite the image header and is reserved for "no

     * host offset preferred". If 0 was a valid host offset, it'd trigger the

     * following overlap check; do that now to avoid having an invalid value in

     * *host_offset. */

    if (!alloc_cluster_offset) {

        ret = qcow2_pre_write_overlap_check(bs, 0, alloc_cluster_offset,

                                            nb_clusters * s->cluster_size);

        assert(ret < 0);

        goto fail;

    }



    /*

     * Save info needed for meta data update.

     *