From 212789925efffe1c552b114321ee74081a7efb03 Mon Sep 17 00:00:00 2001 From: Bo Tu Date: Fri, 3 Jul 2015 15:28:49 +0800 Subject: qemu-iotests: s390x: fix test 049, reject negative sizes in QemuOpts when creating an image qemu-img enable us specifying the size of the image using -o size=xx options. But when we specify an invalid size such as a negtive size then different platform gives different result. parse_option_size() function in util/qemu-option.c will be called to parse the size, a cast was called in the function to cast the input (saved as a double in the function) size to an unsigned int64 value, when the input is a negtive value or exceeds the maximum of uint64, then the result is undefined. According to C99 6.3.1.4, the result of converting a floating point number to an integer that cannot represent the (integer part of) number is undefined. And sure enough the results are different on x86 and s390. C99 Language spec 6.3.1.4 Real floating and integers: the result of this assignment/cast is undefined if the float is not in the open interval (-1, U_MAX+1). Reviewed-by: Max Reitz Reviewed-by: Sascha Silbe Signed-off-by: Bo Tu Signed-off-by: Kevin Wolf --- util/qemu-option.c | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'util/qemu-option.c') diff --git a/util/qemu-option.c b/util/qemu-option.c index efe9d279c4..efd6f024e7 100644 --- a/util/qemu-option.c +++ b/util/qemu-option.c @@ -180,6 +180,11 @@ void parse_option_size(const char *name, const char *value, if (value != NULL) { sizef = strtod(value, &postfix); + if (sizef < 0 || sizef > UINT64_MAX) { + error_setg(errp, QERR_INVALID_PARAMETER_VALUE, name, + "a non-negative number below 2^64"); + return; + } switch (*postfix) { case 'T': sizef *= 1024; -- cgit v1.2.3