ShuriZma
/
xqemu
mirror of https://github.com/xqemu/xqemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

qcow2: make qcow2_encrypt_sectors encrypt in place 

Instead of requiring separate input/output buffers for
encrypting data, change qcow2_encrypt_sectors() to assume
use of a single buffer, encrypting in place. The current
callers all used the same buffer for input/output already.

Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
Message-id: 20170623162419.26068-11-berrange@redhat.com
Reviewed-by: Alberto Garcia <berto@igalia.com>
Signed-off-by: Max Reitz <mreitz@redhat.com>
This commit is contained in:
Daniel P. Berrange 2017-06-23 17:24:09 +01:00 committed by Max Reitz
parent d85f4222b4
commit 446d306d23
3 changed files with 9 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
block/qcow2-cluster.c
View File

@ -358,11 +358,9 @@ static int count_contiguous_clusters_unallocated(int nb_clusters,
} }
/* The crypt function is compatible with the linux cryptoloop /* The crypt function is compatible with the linux cryptoloop
algorithm for < 4 GB images. NOTE: out_buf == in_buf is algorithm for < 4 GB images. */
supported */
int qcow2_encrypt_sectors(BDRVQcow2State *s, int64_t sector_num, int qcow2_encrypt_sectors(BDRVQcow2State *s, int64_t sector_num,
uint8_t *out_buf, const uint8_t *in_buf, uint8_t *buf, int nb_sectors, bool enc,
int nb_sectors, bool enc,
Error **errp) Error **errp)
{ {
union { union {
@ -382,14 +380,12 @@ int qcow2_encrypt_sectors(BDRVQcow2State *s, int64_t sector_num,
} }
if (enc) { if (enc) {
ret = qcrypto_cipher_encrypt(s->cipher, ret = qcrypto_cipher_encrypt(s->cipher,
in_buf, buf, buf,
out_buf,
512, 512,
errp); errp);
} else { } else {
ret = qcrypto_cipher_decrypt(s->cipher, ret = qcrypto_cipher_decrypt(s->cipher,
in_buf, buf, buf,
out_buf,
512, 512,
errp); errp);
} }
@ -397,8 +393,7 @@ int qcow2_encrypt_sectors(BDRVQcow2State *s, int64_t sector_num,
return -1; return -1;
} }
sector_num++; sector_num++;
in_buf += 512; buf += 512;
out_buf += 512;
} }
return 0; return 0;
} }
@ -446,7 +441,7 @@ static bool coroutine_fn do_perform_cow_encrypt(BlockDriverState *bs,
assert(s->cipher); assert(s->cipher);
assert((offset_in_cluster & ~BDRV_SECTOR_MASK) == 0); assert((offset_in_cluster & ~BDRV_SECTOR_MASK) == 0);
assert((bytes & ~BDRV_SECTOR_MASK) == 0); assert((bytes & ~BDRV_SECTOR_MASK) == 0);
if (qcow2_encrypt_sectors(s, sector, buffer, buffer, if (qcow2_encrypt_sectors(s, sector, buffer,
bytes >> BDRV_SECTOR_BITS, true, NULL) < 0) { bytes >> BDRV_SECTOR_BITS, true, NULL) < 0) {
return false; return false;
} }

4
block/qcow2.c
View File

@ -1543,7 +1543,7 @@ static coroutine_fn int qcow2_co_preadv(BlockDriverState *bs, uint64_t offset,
assert((cur_bytes & (BDRV_SECTOR_SIZE - 1)) == 0); assert((cur_bytes & (BDRV_SECTOR_SIZE - 1)) == 0);
Error *err = NULL; Error *err = NULL;
if (qcow2_encrypt_sectors(s, offset >> BDRV_SECTOR_BITS, if (qcow2_encrypt_sectors(s, offset >> BDRV_SECTOR_BITS,
cluster_data, cluster_data, cluster_data,
cur_bytes >> BDRV_SECTOR_BITS, cur_bytes >> BDRV_SECTOR_BITS,
false, &err) < 0) { false, &err) < 0) {
error_free(err); error_free(err);
@ -1677,7 +1677,7 @@ static coroutine_fn int qcow2_co_pwritev(BlockDriverState *bs, uint64_t offset,
qemu_iovec_to_buf(&hd_qiov, 0, cluster_data, hd_qiov.size); qemu_iovec_to_buf(&hd_qiov, 0, cluster_data, hd_qiov.size);
if (qcow2_encrypt_sectors(s, offset >> BDRV_SECTOR_BITS, if (qcow2_encrypt_sectors(s, offset >> BDRV_SECTOR_BITS,
cluster_data, cluster_data, cluster_data,
cur_bytes >>BDRV_SECTOR_BITS, cur_bytes >>BDRV_SECTOR_BITS,
true, &err) < 0) { true, &err) < 0) {
error_free(err); error_free(err);

3
block/qcow2.h
View File

@ -545,8 +545,7 @@ int qcow2_grow_l1_table(BlockDriverState *bs, uint64_t min_size,
int qcow2_write_l1_entry(BlockDriverState *bs, int l1_index); int qcow2_write_l1_entry(BlockDriverState *bs, int l1_index);
int qcow2_decompress_cluster(BlockDriverState *bs, uint64_t cluster_offset); int qcow2_decompress_cluster(BlockDriverState *bs, uint64_t cluster_offset);
int qcow2_encrypt_sectors(BDRVQcow2State *s, int64_t sector_num, int qcow2_encrypt_sectors(BDRVQcow2State *s, int64_t sector_num,
uint8_t *out_buf, const uint8_t *in_buf, uint8_t *buf, int nb_sectors, bool enc, Error **errp);
int nb_sectors, bool enc, Error **errp);
int qcow2_get_cluster_offset(BlockDriverState *bs, uint64_t offset, int qcow2_get_cluster_offset(BlockDriverState *bs, uint64_t offset,
unsigned int *bytes, uint64_t *cluster_offset); unsigned int *bytes, uint64_t *cluster_offset);