33 lines
1.1 KiB
Diff
33 lines
1.1 KiB
Diff
|
qcow2 corruption: Fix alloc_cluster_link_l2 (Kevin Wolf)
|
||
|
|
|
||
|
|
This patch fixes a qcow2 corruption bug introduced in SVN Rev 5861. L2 tables
|
||
|
|
are big endian, so entries must be converted before being passed to functions.
|
||
|
|
|
||
|
|
This bug is easy to trigger. The following script will create and destroy a
|
||
|
|
qcow2 image (the header is gone after three loop iterations):
|
||
|
|
|
||
|
|
#!/bin/bash
|
||
|
|
qemu-img create -f qcow2 test.qcow 1M
|
||
|
|
for i in $(seq 1 10); do
|
||
|
|
qemu-system-x86_64 -hda test.qcow -monitor stdio > /dev/null 2>&1 <<EOF
|
||
|
|
savevm test-$i
|
||
|
|
quit
|
||
|
|
EOF
|
||
|
|
done
|
||
|
|
|
||
|
|
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
|
||
|
|
|
||
|
|
Index: xen-4.2.0-testing/tools/qemu-xen-traditional-dir-remote/block-qcow2.c
|
||
|
|
===================================================================
|
||
|
|
--- xen-4.2.0-testing.orig/tools/qemu-xen-traditional-dir-remote/block-qcow2.c
|
||
|
|
+++ xen-4.2.0-testing/tools/qemu-xen-traditional-dir-remote/block-qcow2.c
|
||
|
|
@@ -916,7 +916,7 @@ static int alloc_cluster_link_l2(BlockDr
|
||
|
|
goto err;
|
||
|
|
|
||
|
|
for (i = 0; i < j; i++)
|
||
|
|
- free_any_clusters(bs, old_cluster[i], 1);
|
||
|
|
+ free_any_clusters(bs, be64_to_cpu(old_cluster[i]) & ~QCOW_OFLAG_COPIED, 1);
|
||
|
|
|
||
|
|
ret = 0;
|
||
|
|
err:
|