[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH for-2.12 05/12] luks: Turn another invalid assertion
From: |
Kevin Wolf |
Subject: |
[Qemu-devel] [PATCH for-2.12 05/12] luks: Turn another invalid assertion into check |
Date: |
Tue, 20 Mar 2018 18:36:25 +0100 |
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 <address@hidden>
---
block/crypto.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
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;
--
2.13.6
- [Qemu-devel] [PATCH for-2.12 01/12] vdi: Change 'static' create option to 'preallocation' in QMP, (continued)
- [Qemu-devel] [PATCH for-2.12 01/12] vdi: Change 'static' create option to 'preallocation' in QMP, Kevin Wolf, 2018/03/20
- [Qemu-devel] [PATCH for-2.12 02/12] vdi: Fix build with CONFIG_VDI_DEBUG, Kevin Wolf, 2018/03/20
- [Qemu-devel] [PATCH for-2.12 04/12] qemu-iotests: Enable 025 for luks, Kevin Wolf, 2018/03/20
- [Qemu-devel] [PATCH for-2.12 06/12] qemu-iotests: Test invalid resize on luks, Kevin Wolf, 2018/03/20
- [Qemu-devel] [PATCH for-2.12 05/12] luks: Turn another invalid assertion into check,
Kevin Wolf <=
- [Qemu-devel] [PATCH for-2.12 03/12] qemu-iotests: Test vdi image creation with QMP, Kevin Wolf, 2018/03/20
- [Qemu-devel] [PATCH for-2.12 07/12] parallels: Check maximum cluster size on create, Kevin Wolf, 2018/03/20
- [Qemu-devel] [PATCH for-2.12 09/12] vhdx: Require power-of-two block size on create, Kevin Wolf, 2018/03/20
- [Qemu-devel] [PATCH for-2.12 08/12] qemu-iotests: Test parallels image creation with QMP, Kevin Wolf, 2018/03/20