aboutsummaryrefslogtreecommitdiff
path: root/tests/qemu-iotests/141
diff options
context:
space:
mode:
authorEric Blake <eblake@redhat.com>2020-07-06 15:39:52 -0500
committerKevin Wolf <kwolf@redhat.com>2020-07-14 15:18:59 +0200
commitb66ff2c29817f5efa18f5120fd6f089fbf59a933 (patch)
tree42b320a5f86e5655bf5f41bd3b493fbca1f1ec82 /tests/qemu-iotests/141
parentbc5ee6da7122f6fe93ed07241a44315a331487e9 (diff)
downloadqemu-b66ff2c29817f5efa18f5120fd6f089fbf59a933.zip
qemu-b66ff2c29817f5efa18f5120fd6f089fbf59a933.tar.gz
qemu-b66ff2c29817f5efa18f5120fd6f089fbf59a933.tar.bz2
iotests: Specify explicit backing format where sensible
There are many existing qcow2 images that specify a backing file but no format. This has been the source of CVEs in the past, but has become more prominent of a problem now that libvirt has switched to -blockdev. With older -drive, at least the probing was always done by qemu (so the only risk of a changed format between successive boots of a guest was if qemu was upgraded and probed differently). But with newer -blockdev, libvirt must specify a format; if libvirt guesses raw where the image was formatted, this results in data corruption visible to the guest; conversely, if libvirt guesses qcow2 where qemu was using raw, this can result in potential security holes, so modern libvirt instead refuses to use images without explicit backing format. The change in libvirt to reject images without explicit backing format has pointed out that a number of tools have been far too reliant on probing in the past. It's time to set a better example in our own iotests of properly setting this parameter. iotest calls to create, rebase, and convert are all impacted to some degree. It's a bit annoying that we are inconsistent on command line - while all of those accept -o backing_file=...,backing_fmt=..., the shortcuts are different: create and rebase have -b and -F, while convert has -B but no -F. (amend has no shortcuts, but the previous patch just deprecated the use of amend to change backing chains). Signed-off-by: Eric Blake <eblake@redhat.com> Message-Id: <20200706203954.341758-9-eblake@redhat.com> Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Diffstat (limited to 'tests/qemu-iotests/141')
-rwxr-xr-xtests/qemu-iotests/1414
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/qemu-iotests/141 b/tests/qemu-iotests/141
index 5192d25..21aa0b4 100755
--- a/tests/qemu-iotests/141
+++ b/tests/qemu-iotests/141
@@ -89,8 +89,8 @@ test_blockjob()
TEST_IMG="$TEST_DIR/b.$IMGFMT" _make_test_img 1M
-TEST_IMG="$TEST_DIR/m.$IMGFMT" _make_test_img -b "$TEST_DIR/b.$IMGFMT" 1M
-_make_test_img -b "$TEST_DIR/m.$IMGFMT" 1M
+TEST_IMG="$TEST_DIR/m.$IMGFMT" _make_test_img -b "$TEST_DIR/b.$IMGFMT" -F $IMGFMT 1M
+_make_test_img -b "$TEST_DIR/m.$IMGFMT" 1M -F $IMGFMT
_launch_qemu -nodefaults