bb9f8dd0e1
Broken in previous commit:
commit aaa4d20b49
Author: Kevin Wolf <kwolf@redhat.com>
Date: Wed Jun 1 15:21:05 2016 +0200
qcow2: Make copy_sectors() byte based
The copy_sectors() code was originally using the 'sector'
parameter for encryption, which was passed in by the caller
from the QCowL2Meta.offset field (aka the guest logical
offset).
After the change, the code is using 'cluster_offset' which
was passed in from QCow2L2Meta.alloc_offset field (aka the
host physical offset).
This would cause the data to be encrypted using an incorrect
initialization vector which will in turn cause later reads
to return garbage.
Although current qcow2 built-in encryption is blocked from
usage in the emulator, one could still hit this if writing
to the file via qemu-{img,io,nbd} commands.
Cc: qemu-stable@nongnu.org
Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
37 lines
1.1 KiB
Plaintext
37 lines
1.1 KiB
Plaintext
QA output created by 158
|
|
== create base ==
|
|
Formatting 'TEST_DIR/t.IMGFMT.base', fmt=IMGFMT size=134217728 encryption=on
|
|
|
|
== writing whole image ==
|
|
Disk image 'TEST_DIR/t.qcow2.base' is encrypted.
|
|
password:
|
|
wrote 134217728/134217728 bytes at offset 0
|
|
128 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
|
|
|
|
== verify pattern ==
|
|
Disk image 'TEST_DIR/t.qcow2.base' is encrypted.
|
|
password:
|
|
read 134217728/134217728 bytes at offset 0
|
|
128 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
|
|
== create overlay ==
|
|
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=134217728 backing_file=TEST_DIR/t.IMGFMT.base encryption=on
|
|
|
|
== writing part of a cluster ==
|
|
Disk image 'TEST_DIR/t.qcow2' is encrypted.
|
|
password:
|
|
wrote 1024/1024 bytes at offset 0
|
|
1 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
|
|
|
|
== verify pattern ==
|
|
Disk image 'TEST_DIR/t.qcow2' is encrypted.
|
|
password:
|
|
read 1024/1024 bytes at offset 0
|
|
1 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
|
|
|
|
== verify pattern ==
|
|
Disk image 'TEST_DIR/t.qcow2' is encrypted.
|
|
password:
|
|
read 64512/64512 bytes at offset 1024
|
|
63 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
|
|
*** done
|