[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 13/13] LUKS: better error message when creating too large file
From: |
Maxim Levitsky |
Subject: |
[PATCH v2 13/13] LUKS: better error message when creating too large files |
Date: |
Thu, 26 Sep 2019 00:35:27 +0300 |
Currently if you attampt to create too large file with luks you
get the following error message:
Formatting 'test.luks', fmt=luks size=17592186044416 key-secret=sec0
qemu-img: test.luks: Could not resize file: File too large
While for raw format the error message is
qemu-img: test.img: The image size is too large for file format 'raw'
The reason for this is that qemu-img checks for errono of the failure,
and presents the later error when it is -EFBIG
However crypto generic code 'swallows' the errno and replaces it
with -EIO.
As an attempt to make it better, we can make luks driver,
detect -EFBIG and in this case present a better error message,
which is what this patch does
The new error message is:
qemu-img: error creating test.luks: The requested file size is too large
Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1534898
Signed-off-by: Maxim Levitsky <address@hidden>
Reviewed-by: Daniel P. Berrangé <address@hidden>
---
block/crypto.c | 21 +++++++++++++++++++--
1 file changed, 19 insertions(+), 2 deletions(-)
diff --git a/block/crypto.c b/block/crypto.c
index 6e822c6e50..19c2ac602c 100644
--- a/block/crypto.c
+++ b/block/crypto.c
@@ -102,10 +102,12 @@ static ssize_t block_crypto_create_init_func(QCryptoBlock
*block,
Error **errp)
{
struct BlockCryptoCreateData *data = opaque;
+ Error *local_error = NULL;
+ int ret;
if (data->size > INT64_MAX || headerlen > INT64_MAX - data->size) {
- error_setg(errp, "The requested file size is too large");
- return -EFBIG;
+ ret = -EFBIG;
+ goto error;
}
/*
@@ -115,6 +117,21 @@ static ssize_t block_crypto_create_init_func(QCryptoBlock
*block,
*/
return blk_truncate(data->blk, data->size + headerlen, data->prealloc,
errp);
+
+ if (ret >= 0) {
+ return ret;
+ }
+
+error:
+ if (ret == -EFBIG) {
+ /* Replace the error message with a better one */
+ error_free(local_error);
+ error_setg(errp, "The requested file size is too large");
+ } else {
+ error_propagate(errp, local_error);
+ }
+
+ return ret;
}
--
2.17.2
- Re: [PATCH v2 01/13] block-crypto: misc refactoring, (continued)
- [PATCH v2 02/13] qcrypto-luks: rename some fields in QCryptoBlockLUKSHeader, Maxim Levitsky, 2019/09/25
- [PATCH v2 03/13] qcrypto-luks: don't overwrite cipher_mode in header, Maxim Levitsky, 2019/09/25
- [PATCH v2 04/13] qcrypto-luks: simplify masterkey and masterkey length, Maxim Levitsky, 2019/09/25
- [PATCH v2 05/13] qcrypto-luks: pass keyslot index rather that pointer to the keyslot, Maxim Levitsky, 2019/09/25
- [PATCH v2 06/13] qcrypto-luks: use the parsed encryption settings in QCryptoBlockLUKS, Maxim Levitsky, 2019/09/25
- [PATCH v2 07/13] qcrypto-luks: purge unused error codes from open callback, Maxim Levitsky, 2019/09/25
- [PATCH v2 08/13] qcrypto-luks: extract store and load header, Maxim Levitsky, 2019/09/25
- [PATCH v2 09/13] qcrypto-luks: extract check and parse header, Maxim Levitsky, 2019/09/25
- [PATCH v2 13/13] LUKS: better error message when creating too large files,
Maxim Levitsky <=
- [PATCH v2 12/13] qcrypto-luks: more rigorous header checking, Maxim Levitsky, 2019/09/25
- [PATCH v2 10/13] qcrypto-luks: extract store key function, Maxim Levitsky, 2019/09/25
- [PATCH v2 11/13] qcrypto-luks: simplify the math used for keyslot locations, Maxim Levitsky, 2019/09/25