[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 08/11] qcow2: Correct snapshots size for overlap chec
From: |
Stefan Hajnoczi |
Subject: |
[Qemu-devel] [PULL 08/11] qcow2: Correct snapshots size for overlap check |
Date: |
Fri, 20 Sep 2013 19:42:08 +0200 |
From: Max Reitz <address@hidden>
Using s->snapshots_size instead of snapshots_size for the metadata
overlap check in qcow2_write_snapshots leads to the detection of an
overlap with the main qcow2 image header when deleting the last
snapshot, since s->snapshots_size has not yet been updated and is
therefore non-zero. However, the offset returned by qcow2_alloc_clusters
will be zero since snapshots_size is zero. Therefore, an overlap is
detected albeit no such will occur.
This patch fixes this by replacing s->snapshots_size by snapshots_size
when calling qcow2_pre_write_overlap_check.
Signed-off-by: Max Reitz <address@hidden>
Signed-off-by: Stefan Hajnoczi <address@hidden>
---
block/qcow2-snapshot.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/block/qcow2-snapshot.c b/block/qcow2-snapshot.c
index 7d14420..5e8a779 100644
--- a/block/qcow2-snapshot.c
+++ b/block/qcow2-snapshot.c
@@ -192,7 +192,7 @@ static int qcow2_write_snapshots(BlockDriverState *bs)
/* The snapshot list position has not yet been updated, so these clusters
* must indeed be completely free */
ret = qcow2_pre_write_overlap_check(bs, QCOW2_OL_DEFAULT, offset,
- s->snapshots_size);
+ snapshots_size);
if (ret < 0) {
return ret;
}
--
1.8.3.1
- [Qemu-devel] [PULL 00/11] Block patches, Stefan Hajnoczi, 2013/09/20
- [Qemu-devel] [PULL 01/11] libcacard: link against qemu-error.o for error_report(), Stefan Hajnoczi, 2013/09/20
- [Qemu-devel] [PULL 02/11] osdep: warn if open(O_DIRECT) on fails with EINVAL, Stefan Hajnoczi, 2013/09/20
- [Qemu-devel] [PULL 03/11] qemu-timer: drop outdated signal safety comments, Stefan Hajnoczi, 2013/09/20
- [Qemu-devel] [PULL 04/11] qemu-timer: make qemu_timer_mod_ns() and qemu_timer_del() thread-safe, Stefan Hajnoczi, 2013/09/20
- [Qemu-devel] [PULL 05/11] qemu-timer: do not take the lock in timer_pending, Stefan Hajnoczi, 2013/09/20
- [Qemu-devel] [PULL 06/11] coroutine: add qemu_coroutine_yield benchmark, Stefan Hajnoczi, 2013/09/20
- [Qemu-devel] [PULL 07/11] coroutine: fix /perf/nesting coroutine benchmark, Stefan Hajnoczi, 2013/09/20
- [Qemu-devel] [PULL 08/11] qcow2: Correct snapshots size for overlap check,
Stefan Hajnoczi <=
- [Qemu-devel] [PULL 09/11] block: don't lose data from last incomplete sector, Stefan Hajnoczi, 2013/09/20
- [Qemu-devel] [PULL 10/11] blockdev: do not default cache.no-flush to true, Stefan Hajnoczi, 2013/09/20
- [Qemu-devel] [PULL 11/11] virtio-blk: do not relay a previous driver's WCE configuration to the current, Stefan Hajnoczi, 2013/09/20