From nobody Sun May 19 20:13:04 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1575512241; cv=none; d=zohomail.com; s=zohoarc; b=eRn+ZzC6jUjTo0yOG6HssjUt7SEUvA+oK6Vlo7tmH1NSh9O6DBvS+4V198C7sH6Mpv/c2IbtUd8aYAw7lKOl0fQ525S0Iu9Y9nYm6gyeK88hwCZM/mOYNGUlh5OV11AjHKZxIIJ01UUi8dbhGIconstHMxYGfdgrupVIIW/C5Oo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1575512241; h=Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=BDyzwJhnCb0knKO4Igu7Rx8SdSyx8Wk7dyFfNsqe3Nc=; b=Rcqz7ic0iX1ToI1qHenURzbGLdPD+9vO58R6mq3K6CGwxoOV0QWayvejFAL0KmqXTbWWbnP8gjLaLncxhy8IImq0gDesoaIr3URR0DoyNusx5y67iZ9s/9w/AWTrmX68vOBDF6ebW+3aEYgFDxP4vEIAk+HEwn7d6nJzs8HEiE8= ARC-Authentication-Results: i=1; mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1575512241700247.48332347616918; Wed, 4 Dec 2019 18:17:21 -0800 (PST) Received: from localhost ([::1]:48988 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1icghj-0006ss-Jn for importer@patchew.org; Wed, 04 Dec 2019 21:17:19 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:51402) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1icgfh-00061q-0U for qemu-devel@nongnu.org; Wed, 04 Dec 2019 21:15:14 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1icgfe-0004lR-Ep for qemu-devel@nongnu.org; Wed, 04 Dec 2019 21:15:12 -0500 Received: from mga05.intel.com ([192.55.52.43]:14702) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1icgfe-0004cp-2k for qemu-devel@nongnu.org; Wed, 04 Dec 2019 21:15:10 -0500 Received: from orsmga006.jf.intel.com ([10.7.209.51]) by fmsmga105.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 04 Dec 2019 18:15:05 -0800 Received: from tao-optiplex-7060.sh.intel.com ([10.239.159.36]) by orsmga006.jf.intel.com with ESMTP; 04 Dec 2019 18:15:03 -0800 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.69,279,1571727600"; d="scan'208";a="213988698" From: Tao Xu To: armbru@redhat.com, mdroth@linux.vnet.ibm.com, ehabkost@redhat.com Subject: [PATCH] util/cutils: Expand do_strtosz parsing precision to 64 bits Date: Thu, 5 Dec 2019 10:14:59 +0800 Message-Id: <20191205021459.29920-1-tao3.xu@intel.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 192.55.52.43 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Tao Xu , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" Parse input string both as a double and as a uint64_t, then use the method which consumes more characters. Update the related test cases. Signed-off-by: Tao Xu --- tests/test-cutils.c | 37 ++++----------------- tests/test-keyval.c | 47 ++++----------------------- tests/test-qemu-opts.c | 39 ++++------------------ util/cutils.c | 74 ++++++++++++++++++++++++++++++------------ 4 files changed, 73 insertions(+), 124 deletions(-) diff --git a/tests/test-cutils.c b/tests/test-cutils.c index 1aa8351520..4a7030c611 100644 --- a/tests/test-cutils.c +++ b/tests/test-cutils.c @@ -1970,40 +1970,25 @@ static void test_qemu_strtosz_simple(void) g_assert_cmpint(err, =3D=3D, 0); g_assert_cmpint(res, =3D=3D, 12345); =20 - /* Note: precision is 53 bits since we're parsing with strtod() */ - - str =3D "9007199254740991"; /* 2^53-1 */ - err =3D qemu_strtosz(str, &endptr, &res); - g_assert_cmpint(err, =3D=3D, 0); - g_assert_cmpint(res, =3D=3D, 0x1fffffffffffff); - g_assert(endptr =3D=3D str + 16); - - str =3D "9007199254740992"; /* 2^53 */ - err =3D qemu_strtosz(str, &endptr, &res); - g_assert_cmpint(err, =3D=3D, 0); - g_assert_cmpint(res, =3D=3D, 0x20000000000000); - g_assert(endptr =3D=3D str + 16); + /* Note: precision is 64 bits (UINT64_MAX) */ =20 str =3D "9007199254740993"; /* 2^53+1 */ err =3D qemu_strtosz(str, &endptr, &res); g_assert_cmpint(err, =3D=3D, 0); - g_assert_cmpint(res, =3D=3D, 0x20000000000000); /* rounded to 53 bits = */ + g_assert_cmpint(res, =3D=3D, 0x20000000000001); g_assert(endptr =3D=3D str + 16); =20 - str =3D "18446744073709549568"; /* 0xfffffffffffff800 (53 msbs set) */ + str =3D "18446744073709550591"; /* 0xfffffffffffffbff */ err =3D qemu_strtosz(str, &endptr, &res); g_assert_cmpint(err, =3D=3D, 0); - g_assert_cmpint(res, =3D=3D, 0xfffffffffffff800); + g_assert_cmpint(res, =3D=3D, 0xfffffffffffffbff); g_assert(endptr =3D=3D str + 20); =20 - str =3D "18446744073709550591"; /* 0xfffffffffffffbff */ + str =3D "18446744073709551615"; /* 2^64-1 (UINT64_MAX) */ err =3D qemu_strtosz(str, &endptr, &res); g_assert_cmpint(err, =3D=3D, 0); - g_assert_cmpint(res, =3D=3D, 0xfffffffffffff800); /* rounded to 53 bit= s */ + g_assert_cmpint(res, =3D=3D, 0xffffffffffffffff); g_assert(endptr =3D=3D str + 20); - - /* 0x7ffffffffffffe00..0x7fffffffffffffff get rounded to - * 0x8000000000000000, thus -ERANGE; see test_qemu_strtosz_erange() */ } =20 static void test_qemu_strtosz_units(void) @@ -2145,16 +2130,6 @@ static void test_qemu_strtosz_erange(void) g_assert_cmpint(err, =3D=3D, -ERANGE); g_assert(endptr =3D=3D str + 2); =20 - str =3D "18446744073709550592"; /* 0xfffffffffffffc00 */ - err =3D qemu_strtosz(str, &endptr, &res); - g_assert_cmpint(err, =3D=3D, -ERANGE); - g_assert(endptr =3D=3D str + 20); - - str =3D "18446744073709551615"; /* 2^64-1 */ - err =3D qemu_strtosz(str, &endptr, &res); - g_assert_cmpint(err, =3D=3D, -ERANGE); - g_assert(endptr =3D=3D str + 20); - str =3D "18446744073709551616"; /* 2^64 */ err =3D qemu_strtosz(str, &endptr, &res); g_assert_cmpint(err, =3D=3D, -ERANGE); diff --git a/tests/test-keyval.c b/tests/test-keyval.c index 09b0ae3c68..fad941fcb8 100644 --- a/tests/test-keyval.c +++ b/tests/test-keyval.c @@ -383,59 +383,26 @@ static void test_keyval_visit_size(void) visit_end_struct(v, NULL); visit_free(v); =20 - /* Note: precision is 53 bits since we're parsing with strtod() */ + /* Note: precision is 64 bits (UINT64_MAX) */ =20 - /* Around limit of precision: 2^53-1, 2^53, 2^53+1 */ - qdict =3D keyval_parse("sz1=3D9007199254740991," - "sz2=3D9007199254740992," - "sz3=3D9007199254740993", + /* Around limit of precision: UINT64_MAX - 1, UINT64_MAX */ + qdict =3D keyval_parse("sz1=3D18446744073709551614," + "sz2=3D18446744073709551615", NULL, &error_abort); v =3D qobject_input_visitor_new_keyval(QOBJECT(qdict)); qobject_unref(qdict); visit_start_struct(v, NULL, NULL, 0, &error_abort); visit_type_size(v, "sz1", &sz, &error_abort); - g_assert_cmphex(sz, =3D=3D, 0x1fffffffffffff); + g_assert_cmphex(sz, =3D=3D, 0xfffffffffffffffe); visit_type_size(v, "sz2", &sz, &error_abort); - g_assert_cmphex(sz, =3D=3D, 0x20000000000000); - visit_type_size(v, "sz3", &sz, &error_abort); - g_assert_cmphex(sz, =3D=3D, 0x20000000000000); - visit_check_struct(v, &error_abort); - visit_end_struct(v, NULL); - visit_free(v); - - /* Close to signed upper limit 0x7ffffffffffffc00 (53 msbs set) */ - qdict =3D keyval_parse("sz1=3D9223372036854774784," /* 7ffffffffffffc0= 0 */ - "sz2=3D9223372036854775295", /* 7ffffffffffffdff = */ - NULL, &error_abort); - v =3D qobject_input_visitor_new_keyval(QOBJECT(qdict)); - qobject_unref(qdict); - visit_start_struct(v, NULL, NULL, 0, &error_abort); - visit_type_size(v, "sz1", &sz, &error_abort); - g_assert_cmphex(sz, =3D=3D, 0x7ffffffffffffc00); - visit_type_size(v, "sz2", &sz, &error_abort); - g_assert_cmphex(sz, =3D=3D, 0x7ffffffffffffc00); - visit_check_struct(v, &error_abort); - visit_end_struct(v, NULL); - visit_free(v); - - /* Close to actual upper limit 0xfffffffffffff800 (53 msbs set) */ - qdict =3D keyval_parse("sz1=3D18446744073709549568," /* fffffffffffff8= 00 */ - "sz2=3D18446744073709550591", /* fffffffffffffbff= */ - NULL, &error_abort); - v =3D qobject_input_visitor_new_keyval(QOBJECT(qdict)); - qobject_unref(qdict); - visit_start_struct(v, NULL, NULL, 0, &error_abort); - visit_type_size(v, "sz1", &sz, &error_abort); - g_assert_cmphex(sz, =3D=3D, 0xfffffffffffff800); - visit_type_size(v, "sz2", &sz, &error_abort); - g_assert_cmphex(sz, =3D=3D, 0xfffffffffffff800); + g_assert_cmphex(sz, =3D=3D, 0xffffffffffffffff); visit_check_struct(v, &error_abort); visit_end_struct(v, NULL); visit_free(v); =20 /* Beyond limits */ qdict =3D keyval_parse("sz1=3D-1," - "sz2=3D18446744073709550592", /* fffffffffffffc00= */ + "sz2=3D18446744073709551616", /* 2^64 */ NULL, &error_abort); v =3D qobject_input_visitor_new_keyval(QOBJECT(qdict)); qobject_unref(qdict); diff --git a/tests/test-qemu-opts.c b/tests/test-qemu-opts.c index ef96e84aed..3a8b8c0168 100644 --- a/tests/test-qemu-opts.c +++ b/tests/test-qemu-opts.c @@ -650,50 +650,25 @@ static void test_opts_parse_size(void) g_assert_cmpuint(opts_count(opts), =3D=3D, 1); g_assert_cmpuint(qemu_opt_get_size(opts, "size1", 1), =3D=3D, 0); =20 - /* Note: precision is 53 bits since we're parsing with strtod() */ + /* Note: precision is 64 bits (UINT64_MAX) */ =20 - /* Around limit of precision: 2^53-1, 2^53, 2^54 */ + /* Around limit of precision: UINT64_MAX - 1, UINT64_MAX */ opts =3D qemu_opts_parse(&opts_list_02, - "size1=3D9007199254740991," - "size2=3D9007199254740992," - "size3=3D9007199254740993", - false, &error_abort); - g_assert_cmpuint(opts_count(opts), =3D=3D, 3); - g_assert_cmphex(qemu_opt_get_size(opts, "size1", 1), - =3D=3D, 0x1fffffffffffff); - g_assert_cmphex(qemu_opt_get_size(opts, "size2", 1), - =3D=3D, 0x20000000000000); - g_assert_cmphex(qemu_opt_get_size(opts, "size3", 1), - =3D=3D, 0x20000000000000); - - /* Close to signed upper limit 0x7ffffffffffffc00 (53 msbs set) */ - opts =3D qemu_opts_parse(&opts_list_02, - "size1=3D9223372036854774784," /* 7ffffffffffff= c00 */ - "size2=3D9223372036854775295", /* 7ffffffffffff= dff */ - false, &error_abort); - g_assert_cmpuint(opts_count(opts), =3D=3D, 2); - g_assert_cmphex(qemu_opt_get_size(opts, "size1", 1), - =3D=3D, 0x7ffffffffffffc00); - g_assert_cmphex(qemu_opt_get_size(opts, "size2", 1), - =3D=3D, 0x7ffffffffffffc00); - - /* Close to actual upper limit 0xfffffffffffff800 (53 msbs set) */ - opts =3D qemu_opts_parse(&opts_list_02, - "size1=3D18446744073709549568," /* ffffffffffff= f800 */ - "size2=3D18446744073709550591", /* ffffffffffff= fbff */ + "size1=3D18446744073709551614," + "size2=3D18446744073709551615", false, &error_abort); g_assert_cmpuint(opts_count(opts), =3D=3D, 2); g_assert_cmphex(qemu_opt_get_size(opts, "size1", 1), - =3D=3D, 0xfffffffffffff800); + =3D=3D, 0xfffffffffffffffe); g_assert_cmphex(qemu_opt_get_size(opts, "size2", 1), - =3D=3D, 0xfffffffffffff800); + =3D=3D, 0xffffffffffffffff); =20 /* Beyond limits */ opts =3D qemu_opts_parse(&opts_list_02, "size1=3D-1", false, &err); error_free_or_abort(&err); g_assert(!opts); opts =3D qemu_opts_parse(&opts_list_02, - "size1=3D18446744073709550592", /* ffffffffffff= fc00 */ + "size1=3D18446744073709551616", /* 2^64 */ false, &err); error_free_or_abort(&err); g_assert(!opts); diff --git a/util/cutils.c b/util/cutils.c index 77acadc70a..b08058c57c 100644 --- a/util/cutils.c +++ b/util/cutils.c @@ -212,24 +212,43 @@ static int do_strtosz(const char *nptr, const char **= end, const char default_suffix, int64_t unit, uint64_t *result) { - int retval; - const char *endptr; + int retval, retd, retu; + const char *suffix, *suffixd, *suffixu; unsigned char c; int mul_required =3D 0; - double val, mul, integral, fraction; + bool use_strtod; + uint64_t valu; + double vald, mul, integral, fraction; + + retd =3D qemu_strtod_finite(nptr, &suffixd, &vald); + retu =3D qemu_strtou64(nptr, &suffixu, 0, &valu); + use_strtod =3D strlen(suffixd) < strlen(suffixu); + + /* + * Parse @nptr both as a double and as a uint64_t, then use the method + * which consumes more characters. + */ + if (use_strtod) { + suffix =3D suffixd; + retval =3D retd; + } else { + suffix =3D suffixu; + retval =3D retu; + } =20 - retval =3D qemu_strtod_finite(nptr, &endptr, &val); if (retval) { goto out; } - fraction =3D modf(val, &integral); - if (fraction !=3D 0) { - mul_required =3D 1; + if (use_strtod) { + fraction =3D modf(vald, &integral); + if (fraction !=3D 0) { + mul_required =3D 1; + } } - c =3D *endptr; + c =3D *suffix; mul =3D suffix_mul(c, unit); if (mul >=3D 0) { - endptr++; + suffix++; } else { mul =3D suffix_mul(default_suffix, unit); assert(mul >=3D 0); @@ -238,23 +257,36 @@ static int do_strtosz(const char *nptr, const char **= end, retval =3D -EINVAL; goto out; } - /* - * Values near UINT64_MAX overflow to 2**64 when converting to double - * precision. Compare against the maximum representable double precis= ion - * value below 2**64, computed as "the next value after 2**64 (0x1p64)= in - * the direction of 0". - */ - if ((val * mul > nextafter(0x1p64, 0)) || val < 0) { - retval =3D -ERANGE; - goto out; + + if (use_strtod) { + /* + * Values near UINT64_MAX overflow to 2**64 when converting to dou= ble + * precision. Compare against the maximum representable double pre= cision + * value below 2**64, computed as "the next value after 2**64 (0x1= p64) + * in the direction of 0". + */ + if ((vald * mul > nextafter(0x1p64, 0)) || vald < 0) { + retval =3D -ERANGE; + goto out; + } + *result =3D vald * mul; + } else { + /* Reject negative input and overflow output */ + while (qemu_isspace(*nptr)) { + nptr++; + } + if (*nptr =3D=3D '-' || UINT64_MAX / (uint64_t) mul < valu) { + retval =3D -ERANGE; + goto out; + } + *result =3D valu * (uint64_t) mul; } - *result =3D val * mul; retval =3D 0; =20 out: if (end) { - *end =3D endptr; - } else if (*endptr) { + *end =3D suffix; + } else if (*suffix) { retval =3D -EINVAL; } =20 --=20 2.20.1