50 lines
2.0 KiB
Diff
50 lines
2.0 KiB
Diff
|
From 10d05a1b052ce5b69cca2f0a45007c31412314d6 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Kevin Wolf <kwolf@redhat.com>
|
||
|
|
Date: Thu, 29 Aug 2024 20:55:27 +0200
|
||
|
|
Subject: [PATCH] raw-format: Fix error message for invalid offset/size
|
||
|
|
MIME-Version: 1.0
|
||
|
|
Content-Type: text/plain; charset=UTF-8
|
||
|
|
Content-Transfer-Encoding: 8bit
|
||
|
|
|
||
|
|
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 <kwolf@redhat.com>
|
||
|
|
Message-ID: <20240829185527.47152-1-kwolf@redhat.com>
|
||
|
|
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
|
||
|
|
Reviewed-by: Hanna Czenczek <hreitz@redhat.com>
|
||
|
|
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
|
||
|
|
(cherry picked from commit 04bbc3ee52b32ac465547bb40c1f090a1b8f315a)
|
||
|
|
Signed-off-by: zhujun2 <zhujun2_yewu@cmss.chinamobile.com>
|
||
|
|
---
|
||
|
|
block/raw-format.c | 4 ++--
|
||
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/block/raw-format.c b/block/raw-format.c
|
||
|
|
index bda757fd19..a8185a3a2c 100644
|
||
|
|
--- a/block/raw-format.c
|
||
|
|
+++ b/block/raw-format.c
|
||
|
|
@@ -109,7 +109,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;
|
||
|
|
}
|
||
|
|
|
||
|
|
@@ -117,7 +117,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;
|
||
|
|
}
|
||
|
|
|
||
|
|
--
|
||
|
|
2.41.0.windows.1
|
||
|
|
|