From: Kevin Wolf Date: Thu, 29 Aug 2024 18:55:27 +0000 (+0200) Subject: raw-format: Fix error message for invalid offset/size X-Git-Tag: v9.2.0-rc0~37^2 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=04bbc3ee52b32ac465547bb40c1f090a1b8f315a;p=thirdparty%2Fqemu.git raw-format: Fix error message for invalid offset/size 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 Message-ID: <20240829185527.47152-1-kwolf@redhat.com> Reviewed-by: Daniel P. Berrangé Reviewed-by: Hanna Czenczek Signed-off-by: Kevin Wolf --- diff --git a/block/raw-format.c b/block/raw-format.c index ac7e8495f66..e08526e2eca 100644 --- a/block/raw-format.c +++ b/block/raw-format.c @@ -111,7 +111,7 @@ raw_apply_options(BlockDriverState *bs, BDRVRawState *s, uint64_t offset, 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; } @@ -119,7 +119,7 @@ raw_apply_options(BlockDriverState *bs, BDRVRawState *s, uint64_t offset, 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; }