diff options
| author | Daniel P. Berrange <berrange@redhat.com> | 2017-11-17 11:29:13 +0000 |
|---|---|---|
| committer | Kevin Wolf <kwolf@redhat.com> | 2017-11-17 13:36:03 +0100 |
| commit | f06033295b51d4868c2b4921ad2287e8f55eb688 (patch) | |
| tree | 2f67d97df74504ba85d0e5ed5f41c3148bf84aa6 /block/qcow2.c | |
| parent | 398e6ad014df261d20d3fd6cff2cfbf940bac714 (diff) | |
| download | qemu-f06033295b51d4868c2b4921ad2287e8f55eb688.tar.gz | |
qcow2: fix image corruption after committing qcow2 image into base
After committing the qcow2 image contents into the base image, qemu-img
will call bdrv_make_empty to drop the payload in the layered image.
When this is done for qcow2 images, it blows away the LUKS encryption
header, making the resulting image unusable. There are two codepaths
for emptying a qcow2 image, and the second (slower) codepath leaves
the LUKS header intact, so force use of that codepath.
Reviewed-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Diffstat (limited to 'block/qcow2.c')
| -rw-r--r-- | block/qcow2.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/block/qcow2.c b/block/qcow2.c index 92e5d548e3..e9a86b7443 100644 --- a/block/qcow2.c +++ b/block/qcow2.c @@ -3601,12 +3601,14 @@ static int qcow2_make_empty(BlockDriverState *bs) l1_clusters = DIV_ROUND_UP(s->l1_size, s->cluster_size / sizeof(uint64_t)); if (s->qcow_version >= 3 && !s->snapshots && - 3 + l1_clusters <= s->refcount_block_size) { + 3 + l1_clusters <= s->refcount_block_size && + s->crypt_method_header != QCOW_CRYPT_LUKS) { /* The following function only works for qcow2 v3 images (it requires * the dirty flag) and only as long as there are no snapshots (because * it completely empties the image). Furthermore, the L1 table and three * additional clusters (image header, refcount table, one refcount - * block) have to fit inside one refcount block. */ + * block) have to fit inside one refcount block. It cannot be used + * for LUKS (yet) as it throws away the LUKS header cluster(s) */ return make_completely_empty(bs); } |