diff options
| author | Kevin Wolf <kwolf@redhat.com> | 2018-03-20 16:38:51 +0100 |
|---|---|---|
| committer | Kevin Wolf <kwolf@redhat.com> | 2018-03-26 12:17:40 +0200 |
| commit | 120bc742c028419c25ed7aa49497b490ce96536c (patch) | |
| tree | 04b2ccfa53370afc5e94e6e64df9b60d9d21bcca /block/crypto.c | |
| parent | 633c175f8cccf647f19cf8954dc46b82ce7926e4 (diff) | |
luks: Turn another invalid assertion into check
Commit e39e959e fixed an invalid assertion in the .bdrv_length
implementation, but left a similar assertion in place for
.bdrv_truncate. Instead of crashing when the user requests a too large
image size, fail gracefully.
A file size of exactly INT64_MAX caused failure before, but is actually
legal.
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Diffstat (limited to 'block/crypto.c')
| -rw-r--r-- | block/crypto.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/block/crypto.c b/block/crypto.c index e0b8856f74..bc6c7e3795 100644 --- a/block/crypto.c +++ b/block/crypto.c @@ -357,7 +357,11 @@ static int block_crypto_truncate(BlockDriverState *bs, int64_t offset, BlockCrypto *crypto = bs->opaque; uint64_t payload_offset = qcrypto_block_get_payload_offset(crypto->block); - assert(payload_offset < (INT64_MAX - offset)); + + if (payload_offset > INT64_MAX - offset) { + error_setg(errp, "The requested file size is too large"); + return -EFBIG; + } offset += payload_offset; |