Commit 191fb11b authored Dec 22, 2015 by Kevin Wolf

qcow2: Make image inaccessible after failed qcow2_invalidate_cache()



If qcow2_invalidate_cache() fails, we are in a state where qcow2_close()
has already been completed, but the image hasn't been reopened yet.
Calling into any qcow2 function for an image in this state will cause
crashes.

The real solution would be to get rid of the close/open pair and instead
do an atomic reset of the involved data structures, but this isn't
trivial, so let's just make the image inaccessible for now.

Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>

parent 140fd5a6

block/qcow2.c

+3 −0

Original line number	Diff line number	Diff line
		@@ -1764,6 +1764,7 @@ static void qcow2_invalidate_cache(BlockDriverState bs, Error *errp)
		bdrv_invalidate_cache(bs->file->bs, &local_err);
		if (local_err) {
		error_propagate(errp, local_err);
		bs->drv = NULL;
		return;
		}

		@@ -1776,9 +1777,11 @@ static void qcow2_invalidate_cache(BlockDriverState bs, Error *errp)
		if (local_err) {
		error_propagate(errp, local_err);
		error_prepend(errp, "Could not reopen qcow2 layer: ");
		bs->drv = NULL;
		return;
		} else if (ret < 0) {
		error_setg_errno(errp, -ret, "Could not reopen qcow2 layer");
		bs->drv = NULL;
		return;
		}