qcow2: Forbid discard in qcow2 v2 images with backing files
PATCH v2 1/1 qcow2: Forbid discard in qcow2 v2 images with backing files
A discard request deallocates the selected clusters so they read back as zeroes. This is done by clearing the cluster offset field and setting QCOW_OFLAG_ZERO in the L2 entry.
This flag is however only supported when qcow_version >= 3. In older images the cluster is simply deallocated, exposing any possible stale data from the backing file.
Since discard is an advisory operation it's safer to simply forbid it in this scenario.
Note that we are adding this check to qcow2_co_pdiscard() and not to qcow2_cluster_discard() or discard_in_l2_slice() because the last two are also used by qcow2_snapshot_create() to discard the clusters used by the VM state. In this case there's no risk of exposing stale data to the guest and we really want that the clusters are always discarded.
---
v2:
- Don't create the image with compat=0.10 in iotest 060 [Max]
- Use $TEST_IMG.base for the backing image name in iotest 289 [Max]
- Add list of unsupported options to iotest 289 [Max]
block/qcow2.c | 6 +++ tests/qemu-iotests/060 | 10 ++--- tests/qemu-iotests/060.out | 2 - tests/qemu-iotests/289 | 91 ++++++++++++++++++++++++++++++++++++++ tests/qemu-iotests/289.out | 52 ++++++++++++++++++++++ tests/qemu-iotests/group | 1 + 6 files changed, 154 insertions(+), 8 deletions(-) create mode 100755 tests/qemu-iotests/289 create mode 100644 tests/qemu-iotests/289.out
block/qcow2.c +6 -0
@@ -3763,6 +3763,12 @@ static coroutine_fn int qcow2_co_pdiscard(BlockDriverState *bs,int ret;BDRVQcow2State *s = bs->opaque; +/* If the image does not support QCOW_OFLAG_ZERO then discarding +* clusters could expose stale data from the backing file. */ +if (s->qcow_version <3 && bs->backing) { +return -ENOTSUP ; + } +if (!QEMU_IS_ALIGNED (offset | bytes, s->cluster_size)) {assert (bytes < s->cluster_size);/* Ignore partial clusters, except for the special case of the
tests/qemu-iotests/060 +4 -6
@@ -160,16 +160,14 @@ TEST_IMG=$BACKING_IMG _make_test_img 1G $QEMU_IO -c 'write 0k 64k' "$BACKING_IMG" | _filter_qemu_io -# compat=0.10 is required in order to make the following discard actually -# unallocate the sector rather than make it a zero sector - we want COW, after -# all. -_make_test_img -o 'compat=0.10' -b "$BACKING_IMG" 1G +_make_test_img -b "$BACKING_IMG" 1G # Write two clusters, the second one enforces creation of an L2 table after # the first data cluster. $QEMU_IO -c 'write 0k 64k' -c 'write 512M 64k' "$TEST_IMG" | _filter_qemu_io -# Discard the first cluster. This cluster will soon enough be reallocated and +# Free the first cluster. This cluster will soon enough be reallocated and # used for COW. -$QEMU_IO -c 'discard 0k 64k' "$TEST_IMG" | _filter_qemu_io +poke_file "$TEST_IMG" '262144' "\x00\x00\x00\x00\x00\x00\x00\x00" # 0x40000 - L2 entry +poke_file "$TEST_IMG" '131082' "\x00\x00" # 0x2000a - Refcount entry # Now, corrupt the image by marking the second L2 table cluster as free. poke_file "$TEST_IMG" '131084' "\x00\x00" # 0x2000c # Start a write operation requiring COW on the image stopping it right before
tests/qemu-iotests/060.out +0 -2
@@ -105,8 +105,6 @@ wrote 65536/65536 bytes at offset 0 64 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) wrote 65536/65536 bytes at offset 536870912 64 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) -discard 65536/65536 bytes at offset 0 -64 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) qcow2: Marking image as corrupt: Preventing invalid write on metadata (overlaps with active L2 table); further corruption events will be suppressed blkdebug: Suspended request '0' write failed: Input/output error
tests/qemu-iotests/289 new file +91 -0
91 lines not on this page · raw message
tests/qemu-iotests/289.out new file +52 -0
52 lines not on this page · raw message
tests/qemu-iotests/group +1 -0
@@ -295,3 +295,4 @@ 284 rw 286 rw quick 288 quick +289 rw auto quick
Signature · 1 line
2.20.1
Quoted 26 lines · Alberto Garcia
A discard request deallocates the selected clusters so they read back as zeroes. This is done by clearing the cluster offset field and setting
QCOW_OFLAG_ZEROin the L2 entry.This flag is however only supported when
qcow_version>= 3. In older images the cluster is simply deallocated, exposing any possible stale data from the backing file.Since discard is an advisory operation it's safer to simply forbid it in this scenario.
Note that we are adding this check to
qcow2_co_pdiscard()and not toqcow2_cluster_discard()ordiscard_in_l2_slice()because the last two are also used byqcow2_snapshot_create()to discard the clusters used by the VM state. In this case there's no risk of exposing stale data to the guest and we really want that the clusters are always discarded.Signed-off-by Alberto Garcia <[email protected]>---
v2:- Don't create the image with compat=0.10 in iotest 060 [Max]
- Use $TEST_IMG.base for the backing image name in iotest 289 [Max]
- Add list of unsupported options to iotest 289 [Max]
Quoted 9 lines
block/qcow2.c | 6 +++ tests/qemu-iotests/060 | 10 ++--- tests/qemu-iotests/060.out | 2 - tests/qemu-iotests/289 | 91 ++++++++++++++++++++++++++++++++++++++ tests/qemu-iotests/289.out | 52 ++++++++++++++++++++++ tests/qemu-iotests/group | 1 + 6 files changed, 154 insertions(+), 8 deletions(-) create mode 100755 tests/qemu-iotests/289 create mode 100644 tests/qemu-iotests/289.out
(Maybe someone else wants to give a comment still, though)
Am 24.03.2020 um 13:16 hat Alberto Garcia geschrieben:
Quoted 11 lines
A discard request deallocates the selected clusters so they read back as zeroes. This is done by clearing the cluster offset field and setting
QCOW_OFLAG_ZEROin the L2 entry.This flag is however only supported when
qcow_version>= 3. In older images the cluster is simply deallocated, exposing any possible stale data from the backing file.Since discard is an advisory operation it's safer to simply forbid it in this scenario.
Quoted 8 lines
Note that we are adding this check to
qcow2_co_pdiscard()and not toqcow2_cluster_discard()ordiscard_in_l2_slice()because the last two are also used byqcow2_snapshot_create()to discard the clusters used by the VM state. In this case there's no risk of exposing stale data to the guest and we really want that the clusters are always discarded.Signed-off-by Alberto Garcia <[email protected]>
The test number 289 is already taken, so this needs a rebase.
Quoted 4 lines
tests/qemu-iotests/289 new file +4
-0+echo +echo "### Test 'qemu-io -c discard' on a QCOW2 image without a backing file" +echo +for qcow2_compat in 0.10 1.1; do
tests/qemu-iotests/289 line 58
Quoted 10 lines
tests/qemu-iotests/289 new file +10
-0+ echo "# Create an image with compat=$qcow2_compat without a backing file" + _make_test_img -o "compat=$qcow2_compat" 128k + + echo "# Fill all clusters with data and then discard them" + $QEMU_IO -c 'write -P 0x01 0 128k' "$TEST_IMG" | _filter_qemu_io + $QEMU_IO -c 'discard 0 128k' "$TEST_IMG" | _filter_qemu_io + + echo "# Read the data from the discarded clusters" + $QEMU_IO -c 'read -P 0x00 0 128k' "$TEST_IMG" | _filter_qemu_io +done
How about adding a 'qemu-img map' call just to have some more direct information about what happened to the allocation status?
tests/qemu-iotests/289 line 71
Quoted 13 lines
tests/qemu-iotests/289 new file +13
-0+ +echo +echo "### Test 'qemu-io -c discard' on a QCOW2 image with a backing file" +echo + +echo "# Create a backing image and fill it with data" +BACKING_IMG="$TEST_IMG.base" +TEST_IMG="$BACKING_IMG" _make_test_img 128k +$QEMU_IO -c 'write -P 0xff 0 128k' "$BACKING_IMG" | _filter_qemu_io + +for qcow2_compat in 0.10 1.1; do + echo "# Create an image with compat=$qcow2_compat and a backing file" + _make_test_img -o "compat=$qcow2_compat" -b "$BACKING_IMG"
I would write some non-zero data to the backing file so that you can later distinguish zero clusters from unallocated clusters.
Quoted 4 lines
tests/qemu-iotests/289 new file +4
-0+ echo "# Fill all clusters with data and then discard them" + $QEMU_IO -c 'write -P 0x01 0 128k' "$TEST_IMG" | _filter_qemu_io + $QEMU_IO -c 'discard 0 128k' "$TEST_IMG" | _filter_qemu_io +
tests/qemu-iotests/289 line 86
Quoted 10 lines
tests/qemu-iotests/289 new file +10
-0+ echo "# Read the data from the discarded clusters" + if [ "$qcow2_compat" = "1.1" ]; then + # In qcow2 v3 clusters are zeroed (with QCOW_OFLAG_ZERO) + $QEMU_IO -c 'read -P 0x00 0 128k' "$TEST_IMG" | _filter_qemu_io + else + # In qcow2 v2 if there's a backing image we cannot zero the clusters + # without exposing the backing file data so discard does nothing + $QEMU_IO -c 'read -P 0x01 0 128k' "$TEST_IMG" | _filter_qemu_io + fi +done
Kevin
Quoted 11 lines · Kevin Wolf
tests/qemu-iotests/289 line 71
Quoted 8 lines
tests/qemu-iotests/289 new file +8
-0+echo "# Create a backing image and fill it with data" +BACKING_IMG="$TEST_IMG.base" +TEST_IMG="$BACKING_IMG" _make_test_img 128k +$QEMU_IO -c 'write -P 0xff 0 128k' "$BACKING_IMG" | _filter_qemu_io + +for qcow2_compat in 0.10 1.1; do + echo "# Create an image with compat=$qcow2_compat and a backing file" + _make_test_img -o "compat=$qcow2_compat" -b "$BACKING_IMG"I would write some non-zero data to the backing file so that you can later distinguish zero clusters from unallocated clusters.
I'm doing that already (immediately before the 'for' loop).
I'll add the output of qemu-img map in v3.
Berto