qcow2: Forbid discard in qcow2 v2 images with backing files
PATCH v4 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.
---
v4:
- Show output of qemu-img map when there's no backing file [Eric]
v3:
- Rebase and change iotest number
- Show output of qemu-img map in iotest 290 [Kevin]
- Use the l2_offset and rb_offset variables in iotest 060
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 | 12 ++--- tests/qemu-iotests/060.out | 2 - tests/qemu-iotests/290 | 97 ++++++++++++++++++++++++++++++++++++++ tests/qemu-iotests/290.out | 61 ++++++++++++++++++++++++ tests/qemu-iotests/group | 1 + 6 files changed, 170 insertions(+), 9 deletions(-) create mode 100755 tests/qemu-iotests/290 create mode 100644 tests/qemu-iotests/290.out
block/qcow2.c +6 -0
@@ -3784,6 +3784,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 +5 -7
@@ -160,18 +160,16 @@ 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" "$l2_offset" "\x00\x00\x00\x00\x00\x00\x00\x00" +poke_file "$TEST_IMG" "$(($rb_offset+10))" "\x00\x00" # Now, corrupt the image by marking the second L2 table cluster as free. -poke_file "$TEST_IMG" '131084' "\x00\x00" # 0x2000c +poke_file "$TEST_IMG" "$(($rb_offset+12))" "\x00\x00" # Start a write operation requiring COW on the image stopping it right before # doing the read; then, trigger the corruption prevention by writing anything to # any unallocated cluster, leading to an attempt to overwrite the second L2
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/290 new file +97 -0
97 lines not on this page · raw message
tests/qemu-iotests/290.out new file +61 -0
61 lines not on this page · raw message
tests/qemu-iotests/group +1 -0
@@ -296,3 +296,4 @@ 286 rw quick 288 quick 289 rw quick +290 rw auto quick
Signature · 1 line
2.20.1
Quoted 18 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.
Quoted 4 lines
Signed-off-by Alberto Garcia <[email protected]>---
v4:
- Show output of qemu-img map when there's no backing file [Eric]
Signature · 3 lines
Eric Blake, Principal Software Engineer Red Hat, Inc. +1-919-301-3226 Virtualization: qemu.org | libvirt.org
Max Reitz
AppliedQuoted 34 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]>---
v4:
- Show output of qemu-img map when there's no backing file [Eric]v3:
- Rebase and change iotest number
- Show output of qemu-img map in iotest 290 [Kevin]
- Use thel2_offsetandrb_offsetvariables in iotest 060v2:
- 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 | 12 ++--- tests/qemu-iotests/060.out | 2 - tests/qemu-iotests/290 | 97 ++++++++++++++++++++++++++++++++++++++ tests/qemu-iotests/290.out | 61 ++++++++++++++++++++++++ tests/qemu-iotests/group | 1 + 6 files changed, 170 insertions(+), 9 deletions(-) create mode 100755 tests/qemu-iotests/290 create mode 100644 tests/qemu-iotests/290.out
Thanks, applied to my block branch:
https://git.xanclic.moe/XanClic/qemu/commits/branch/block
Max
Quoted 45 lines · Max Reitz
Quoted 34 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]>---
v4:
- Show output of qemu-img map when there's no backing file [Eric]v3:
- Rebase and change iotest number
- Show output of qemu-img map in iotest 290 [Kevin]
- Use thel2_offsetandrb_offsetvariables in iotest 060v2:
- 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 | 12 ++--- tests/qemu-iotests/060.out | 2 - tests/qemu-iotests/290 | 97 ++++++++++++++++++++++++++++++++++++++ tests/qemu-iotests/290.out | 61 ++++++++++++++++++++++++ tests/qemu-iotests/group | 1 + 6 files changed, 170 insertions(+), 9 deletions(-) create mode 100755 tests/qemu-iotests/290 create mode 100644 tests/qemu-iotests/290.out
Quoted 3 lines
Thanks, applied to my block branch:
I’ll have to dequeue it again, because it breaks iotests 046 and 177 (both of which already have special handling for v2-specific discard; but it needs to be adjusted now that the discard operation no longer reveals the backing file contents).
Max
Quoted 4 lines · Max Reitz
I’ll have to dequeue it again, because it breaks iotests 046 and 177 (both of which already have special handling for v2-specific discard; but it needs to be adjusted now that the discard operation no longer reveals the backing file contents).
??? None of those break for me, is that in your branch or in master?
Berto
Quoted 7 lines · Alberto Garcia
Quoted 4 lines · Max Reitz
I’ll have to dequeue it again, because it breaks iotests 046 and 177 (both of which already have special handling for v2-specific discard; but it needs to be adjusted now that the discard operation no longer reveals the backing file contents).
??? None of those break for me, is that in your branch or in master?
Er, oops. Somehow I forgot to note that they break for v2 images, so with -o compat=0.10:
$ ./check -T -qcow2 -o compat=0.10 46 177
Max