| Message ID | 1502117160-24655-57-git-send-email-armbru@redhat.com |
|---|---|
| State | New |
| Headers | show |
On Mon, Aug 07, 2017 at 04:46:00PM +0200, Markus Armbruster wrote: > Byte offsets should use QAPI type 'size' (uint64_t). > QCryptoBlockInfoLUKS member @payload-offset and > QCryptoBlockInfoLUKSSlot member @key-offset are 'int' (int64_t). > qcrypto_block_luks_get_info() gets the former QCryptoBlock member > @payload_offset, implicitly converting from uint64_t, and computes the > latter from QCryptoBlockLUKSKeySlot member @key_offset, implicitly > converting from long long. > > Change both offsets to 'size'. > > query-block and query-named-block-nodes now report @payload-offset > values above 2^63-1 correctly instead of their (negative) two's > complement. Should never occur in practice. > > Signed-off-by: Markus Armbruster <armbru@redhat.com> Reviewed-by: Daniel P. Berrange <berrange@redhat.com> Regards, Daniel
diff --git a/qapi/crypto.json b/qapi/crypto.json index 6b6fde3..57a10cb 100644 --- a/qapi/crypto.json +++ b/qapi/crypto.json @@ -266,7 +266,7 @@ 'data': {'active': 'bool', '*iters': 'int', '*stripes': 'int', - 'key-offset': 'int' } } + 'key-offset': 'size' } } ## @@ -292,7 +292,7 @@ 'ivgen-alg': 'QCryptoIVGenAlgorithm', '*ivgen-hash-alg': 'QCryptoHashAlgorithm', 'hash-alg': 'QCryptoHashAlgorithm', - 'payload-offset': 'int', + 'payload-offset': 'size', 'master-key-iters': 'int', 'uuid': 'str', 'slots': [ 'QCryptoBlockInfoLUKSSlot' ] }}
Byte offsets should use QAPI type 'size' (uint64_t). QCryptoBlockInfoLUKS member @payload-offset and QCryptoBlockInfoLUKSSlot member @key-offset are 'int' (int64_t). qcrypto_block_luks_get_info() gets the former QCryptoBlock member @payload_offset, implicitly converting from uint64_t, and computes the latter from QCryptoBlockLUKSKeySlot member @key_offset, implicitly converting from long long. Change both offsets to 'size'. query-block and query-named-block-nodes now report @payload-offset values above 2^63-1 correctly instead of their (negative) two's complement. Should never occur in practice. Signed-off-by: Markus Armbruster <armbru@redhat.com> --- qapi/crypto.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)