[Stable-7.2.15,14/33] raw-format: Fix error message for invalid offset/size

Commit Message

Michael Tokarev Nov. 9, 2024, 6:38 a.m. UTC

From: Kevin Wolf <[e-mail]>

s->offset and s->size are only set at the end of the function and still
contain the old values when formatting the error message. Print the
parameters with the new values that we actually checked instead.

Fixes: 500e2434207d ('raw-format: Split raw_read_options()')
Signed-off-by: Kevin Wolf <[e-mail]>
Message-ID: <[e-mail]>
Reviewed-by: Daniel P. Berrangé <[e-mail]>
Reviewed-by: Hanna Czenczek <[e-mail]>
Signed-off-by: Kevin Wolf <[e-mail]>
(cherry picked from commit 04bbc3ee52b32ac465547bb40c1f090a1b8f315a)
Signed-off-by: Michael Tokarev <[e-mail]>

Patch

diff --git a/block/raw-format.c b/block/raw-format.c
index a68014ef0b..f3fc604f92 100644
--- a/block/raw-format.c
+++ b/block/raw-format.c
@@ -110,7 +110,7 @@  static int raw_apply_options(BlockDriverState *bs, BDRVRawState *s,
     if (offset > real_size) {
         error_setg(errp, "Offset (%" PRIu64 ") cannot be greater than "
                    "size of the containing file (%" PRId64 ")",
-                   s->offset, real_size);
+                   offset, real_size);
         return -EINVAL;
     }
 
@@ -118,7 +118,7 @@  static int raw_apply_options(BlockDriverState *bs, BDRVRawState *s,
         error_setg(errp, "The sum of offset (%" PRIu64 ") and size "
                    "(%" PRIu64 ") has to be smaller or equal to the "
                    " actual size of the containing file (%" PRId64 ")",
-                   s->offset, s->size, real_size);
+                   offset, size, real_size);
         return -EINVAL;
     }