Skip to contentSkip to conversation

LUKS: Fix error message when underlying fs don't support large enough files

PATCH Superseded Maxim Levitsky 2 participants 5 messages Apr 16, 2020 – Apr 20, 2020 Block layer

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

cover LUKS: Fix error message when underlying fs don't support large enough files

This is a repost of the same trivial patch I already, which fell through the cracks. Could someone queue it up so I close the bugzilla I have for this?

Best regards,
Maxim Levitsky

Maxim Levitsky (1):
block/crypto: better error message when creating too large files

 block/crypto.c | 23 ++++++++++++++++++++---
 1 file changed, 20 insertions(+), 3 deletions(-)
Signature · 1 line
2.17.2
#1 lore raw

PATCH 1/1 block/crypto: better error message when creating too large files

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 errno 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

---
 block/crypto.c | 23 ++++++++++++++++++++---
 1 file changed, 20 insertions(+), 3 deletions(-)
block/crypto.c +20 -3
index d577f89659..1b604beb30 100644
@@ -104,18 +104,35 @@ static ssize_t block_crypto_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;
     }
 
     /* User provided size should reflect amount of space made
      * available to the guest, so we must take account of that
      * which will be used by the crypto header
      */
-    return blk_truncate(data->blk, data->size + headerlen, false,
+    ret = blk_truncate(data->blk, data->size + headerlen, false,
                         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;
 }
 
 
Signature · 1 line
2.17.2
#2 lore raw

Re: [PATCH 1/1] block/crypto: better error message when creating too large files

Am 16.04.2020 um 11:50 hat Maxim Levitsky geschrieben:

Quoted 46 lines

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 errno 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

---
 block/crypto.c | 23 ++++++++++++++++++++---
 1 file changed, 20 insertions(+), 3 deletions(-)
block/crypto.c +3 -2
index d577f89659..1b604beb30 100644
@@ -104,18 +104,35 @@ static ssize_t block_crypto_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;

block/crypto.c static ssize_t block_crypto_init_func(QCryptoBlock *block, · line 120

Quoted 10 lines
block/crypto.c +2 -1
+        goto error;
     }
 
     /* User provided size should reflect amount of space made
      * available to the guest, so we must take account of that
      * which will be used by the crypto header
      */
-    return blk_truncate(data->blk, data->size + headerlen, false,
+    ret = blk_truncate(data->blk, data->size + headerlen, false,
                         data->prealloc, errp);

I think you intended to use &local_error (which is by the way spelt local_err in most other places) here instead of passing errp and never assigning local_err at all.

Kevin

Quoted 21 lines
block/crypto.c +15 -0
+
+    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;
 }
 
 
Signature · 1 line
2.17.2
#3 lore raw

Re: [PATCH 1/1] block/crypto: better error message when creating too large files

Quoted 50 lines · Kevin Wolf

Am 16.04.2020 um 11:50 hat Maxim Levitsky geschrieben:

Quoted 49 lines

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 errno 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

---
 block/crypto.c | 23 ++++++++++++++++++++---
 1 file changed, 20 insertions(+), 3 deletions(-)
block/crypto.c +4 -2
index d577f89659..1b604beb30 100644
@@ -104,18 +104,35 @@ static ssize_t block_crypto_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;
     }
 
Quoted 11 lines

block/crypto.c static ssize_t block_crypto_init_func(QCryptoBlock *block, · line 120

Quoted 7 lines
block/crypto.c +1 -1
     /* User provided size should reflect amount of space made
      * available to the guest, so we must take account of that
      * which will be used by the crypto header
      */
-    return blk_truncate(data->blk, data->size + headerlen, false,
+    ret = blk_truncate(data->blk, data->size + headerlen, false,
                         data->prealloc, errp);

I think you intended to use &local_error (which is by the way spelt local_err in most other places) here instead of passing errp and never assigning local_err at all.

Absolutely. This is very old patch that I used to keep with the LUKs patchset, and I remember I rebased it few times. I probably didn't fix a conflict correctly or so.

Best regards,
Maxim Levitsky

Quoted 24 lines

Kevin

Quoted 21 lines
block/crypto.c +15 -0
+
+    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;
 }
 
 
Signature · 1 line
2.17.2
#4 lore raw
In reply to Maxim Levitsky
Quoted 2 lines · Maxim Levitsky

This is a repost of the same trivial patch I already, which fell through the cracks. Could someone queue it up so I close the bugzilla I have for this?

I a word - need more coffee :-)
I mean I already posted this patch few months ago but it was forgotten, due to merge window/etc.

Best regards,
Maxim Levitsky

Quoted 10 lines

Best regards,
Maxim Levitsky

Maxim Levitsky (1):
block/crypto: better error message when creating too large files

 block/crypto.c | 23 ++++++++++++++++++++---
 1 file changed, 20 insertions(+), 3 deletions(-)