Commit 20509c4b authored by Alberto Garcia's avatar Alberto Garcia Committed by Kevin Wolf
Browse files

block: freeze the backing chain earlier in stream_start() 



Commit 65854933 added code to freeze
the backing chain from 'top' to 'base' for the duration of the
block-stream job.

The problem is that the freezing happens too late in stream_start():
during the bdrv_reopen_set_read_only() call earlier in that function
another job can jump in and remove the base image. If that happens we
have an invalid chain and QEMU crashes.

This patch puts the bdrv_freeze_backing_chain() call at the beginning
of the function.

Signed-off-by: default avatarAlberto Garcia <berto@igalia.com>
Reviewed-by: default avatarVladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Signed-off-by: default avatarKevin Wolf <kwolf@redhat.com>
parent 0f0998f6

block/stream.c

+7 −6
Original line number Diff line number Diff line
@@ -238,11 +238,16 @@ void stream_start(const char *job_id, BlockDriverState *bs, 
    BlockDriverState *iter;

    bool bs_read_only;



    if (bdrv_freeze_backing_chain(bs, base, errp) < 0) {

        return;

    }



    /* Make sure that the image is opened in read-write mode */

    bs_read_only = bdrv_is_read_only(bs);

    if (bs_read_only) {

        if (bdrv_reopen_set_read_only(bs, false, errp) != 0) {

            return;

            bs_read_only = false;

            goto fail;

        }

    }
@@ -269,11 +274,6 @@ void stream_start(const char *job_id, BlockDriverState *bs, 
                           &error_abort);

    }



    if (bdrv_freeze_backing_chain(bs, base, errp) < 0) {

        job_early_fail(&s->common.job);

        goto fail;

    }



    s->base = base;

    s->backing_file_str = g_strdup(backing_file_str);

    s->bs_read_only = bs_read_only;
@@ -288,4 +288,5 @@ fail: 
    if (bs_read_only) {

        bdrv_reopen_set_read_only(bs, true, NULL);

    }

    bdrv_unfreeze_backing_chain(bs, base);

}