From nobody Thu Nov 6 06:04:19 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (208.118.235.17 [208.118.235.17]) by mx.zohomail.com with SMTPS id 1539345112794980.7145474728187; Fri, 12 Oct 2018 04:51:52 -0700 (PDT) Received: from localhost ([::1]:39638 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gAvyp-0003xc-2m for importer@patchew.org; Fri, 12 Oct 2018 07:51:43 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36279) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gAvwh-0002uT-3H for qemu-devel@nongnu.org; Fri, 12 Oct 2018 07:49:32 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gAvwf-0008MK-9S for qemu-devel@nongnu.org; Fri, 12 Oct 2018 07:49:30 -0400 Received: from mx1.redhat.com ([209.132.183.28]:40568) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gAvwe-0008JR-VM for qemu-devel@nongnu.org; Fri, 12 Oct 2018 07:49:29 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 4BA6A7D0F8; Fri, 12 Oct 2018 11:49:28 +0000 (UTC) Received: from t460s.redhat.com (ovpn-116-36.ams2.redhat.com [10.36.116.36]) by smtp.corp.redhat.com (Postfix) with ESMTP id 44EEB6F115; Fri, 12 Oct 2018 11:49:26 +0000 (UTC) From: David Hildenbrand To: qemu-devel@nongnu.org Date: Fri, 12 Oct 2018 13:49:10 +0200 Message-Id: <20181012114916.23532-2-david@redhat.com> In-Reply-To: <20181012114916.23532-1-david@redhat.com> References: <20181012114916.23532-1-david@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.26]); Fri, 12 Oct 2018 11:49:28 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v2 1/7] qapi: correctly parse uint64_t values from strings X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Eduardo Habkost , "Michael S . Tsirkin" , David Hildenbrand , Michael Roth , Markus Armbruster , Igor Mammedov , "Dr . David Alan Gilbert" , David Gibson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RDMRC_1 RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Right now, we parse uint64_t values just like int64_t values, resulting in negative values getting accepted and certain valid large numbers only being representable as negative numbers. Also, reported errors indicate that an int64_t is expected. Parse uin64_t separately. Implementation inspired by original parse_str() implementation. E.g. we can now specify -device nvdimm,memdev=3Dmem1,id=3Dnv1,addr=3D0xFFFFFFFFC0000000 Instead of going via negative values -device nvdimm,memdev=3Dmem1,id=3Dnv1,addr=3D-0x40000000 Resulting in the same values (qemu) info memory-devices Memory device [nvdimm]: "nv1" addr: 0xffffffffc0000000 slot: 0 node: 0 Signed-off-by: David Hildenbrand --- qapi/string-input-visitor.c | 117 ++++++++++++++++++++++++++++++++---- 1 file changed, 106 insertions(+), 11 deletions(-) diff --git a/qapi/string-input-visitor.c b/qapi/string-input-visitor.c index b3fdd0827d..af0a841152 100644 --- a/qapi/string-input-visitor.c +++ b/qapi/string-input-visitor.c @@ -19,6 +19,7 @@ #include "qapi/qmp/qnull.h" #include "qemu/option.h" #include "qemu/queue.h" +#include "qemu/cutils.h" #include "qemu/range.h" =20 =20 @@ -44,7 +45,8 @@ static void free_range(void *range, void *dummy) g_free(range); } =20 -static int parse_str(StringInputVisitor *siv, const char *name, Error **er= rp) +static int parse_str_int64(StringInputVisitor *siv, const char *name, + Error **errp) { char *str =3D (char *) siv->string; long long start, end; @@ -118,6 +120,75 @@ error: return -1; } =20 +static int parse_str_uint64(StringInputVisitor *siv, const char *name, + Error **errp) +{ + const char *str =3D (char *) siv->string; + uint64_t start, end; + const char *endptr; + Range *cur; + + if (siv->ranges) { + return 0; + } + + if (!*str) { + return 0; + } + + do { + if (!qemu_strtou64(str, &endptr, 0, &start)) { + if (*endptr =3D=3D '\0') { + cur =3D g_malloc0(sizeof(*cur)); + range_set_bounds(cur, start, start); + siv->ranges =3D range_list_insert(siv->ranges, cur); + cur =3D NULL; + str =3D NULL; + } else if (*endptr =3D=3D '-') { + str =3D endptr + 1; + if (!qemu_strtou64(str, &endptr, 0, &end) && start <=3D en= d) { + if (*endptr =3D=3D '\0') { + cur =3D g_malloc0(sizeof(*cur)); + range_set_bounds(cur, start, end); + siv->ranges =3D range_list_insert(siv->ranges, cur= ); + cur =3D NULL; + str =3D NULL; + } else if (*endptr =3D=3D ',') { + str =3D endptr + 1; + cur =3D g_malloc0(sizeof(*cur)); + range_set_bounds(cur, start, end); + siv->ranges =3D range_list_insert(siv->ranges, cur= ); + cur =3D NULL; + } else { + goto error; + } + } else { + goto error; + } + } else if (*endptr =3D=3D ',') { + str =3D endptr + 1; + cur =3D g_malloc0(sizeof(*cur)); + range_set_bounds(cur, start, start); + siv->ranges =3D range_list_insert(siv->ranges, cur); + cur =3D NULL; + } else { + goto error; + } + } else { + goto error; + } + } while (str); + + return 0; +error: + g_list_foreach(siv->ranges, free_range, NULL); + g_list_free(siv->ranges); + siv->ranges =3D NULL; + error_setg(errp, QERR_INVALID_PARAMETER_VALUE, name ? name : "null", + "an uint64 value or range"); + return -1; +} + static void start_list(Visitor *v, const char *name, GenericList **list, size_t size, Error **errp) @@ -128,7 +199,7 @@ start_list(Visitor *v, const char *name, GenericList **= list, size_t size, assert(list); siv->list =3D list; =20 - if (parse_str(siv, name, errp) < 0) { + if (parse_str_int64(siv, name, errp) < 0) { *list =3D NULL; return; } @@ -216,7 +287,7 @@ static void parse_type_int64(Visitor *v, const char *na= me, int64_t *obj, { StringInputVisitor *siv =3D to_siv(v); =20 - if (parse_str(siv, name, errp) < 0) { + if (parse_str_int64(siv, name, errp) < 0) { return; } =20 @@ -252,15 +323,39 @@ error: static void parse_type_uint64(Visitor *v, const char *name, uint64_t *obj, Error **errp) { - /* FIXME: parse_type_int64 mishandles values over INT64_MAX */ - int64_t i; - Error *err =3D NULL; - parse_type_int64(v, name, &i, &err); - if (err) { - error_propagate(errp, err); - } else { - *obj =3D i; + StringInputVisitor *siv =3D to_siv(v); + + if (parse_str_uint64(siv, name, errp) < 0) { + return; + } + + if (!siv->ranges) { + goto error; + } + + if (!siv->cur_range) { + Range *r; + + siv->cur_range =3D g_list_first(siv->ranges); + if (!siv->cur_range) { + goto error; + } + + r =3D siv->cur_range->data; + if (!r) { + goto error; + } + + siv->cur =3D range_lob(r); } + + *obj =3D siv->cur; + siv->cur++; + return; + +error: + error_setg(errp, QERR_INVALID_PARAMETER_VALUE, name ? name : "null", + "an uint64 value or range"); } =20 static void parse_type_size(Visitor *v, const char *name, uint64_t *obj, --=20 2.17.1