raw-format: Fix error message for invalid offset/size
PATCH 1/1 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.
--- block/raw-format.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
block/raw-format.c +2 -2
@@ -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 ; }
Signature · 1 line
2.46.0
Quoted 9 lines · Kevin Wolf
s->offsetands->sizeare 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 <[email protected]>--- block/raw-format.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
With regards,
Daniel
Signature · 3 lines
|: https://berrange.com -o- https://www.flickr.com/photos/dberrange :| |: https://libvirt.org -o- https://fstop138.berrange.com :| |: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|
Quoted 9 lines · Kevin Wolf
s->offsetands->sizeare 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 <[email protected]>--- block/raw-format.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
Quoted 6 lines · Kevin Wolf
s->offsetands->sizeare 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 <[email protected]>
I picked this up for stable. It's not a big deal but the change is trivial too.
JFYI,
/mjt