luks: Turn invalid assertion into check

The .bdrv_getlength implementation of the crypto block driver asserted
that the payload offset isn't after EOF. This is an invalid assertion to
make as the image file could be corrupted. Instead, check it and return
-EIO if the file is too small for the payload offset.

Zero length images are fine, so trigger -EIO only on offset > len, not
on offset >= len as the assertion did before.

Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
This commit is contained in:
Kevin Wolf 2018-03-05 17:39:31 +01:00
parent 1bedcaf120
commit e39e959e89

View File

@ -518,7 +518,10 @@ static int64_t block_crypto_getlength(BlockDriverState *bs)
uint64_t offset = qcrypto_block_get_payload_offset(crypto->block); uint64_t offset = qcrypto_block_get_payload_offset(crypto->block);
assert(offset < INT64_MAX); assert(offset < INT64_MAX);
assert(offset < len);
if (offset > len) {
return -EIO;
}
len -= offset; len -= offset;