From nobody Wed Nov 5 02:32:12 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 1532762330292569.6893786400261; Sat, 28 Jul 2018 00:18:50 -0700 (PDT) Received: from localhost ([::1]:44147 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fjJUr-00077w-EA for importer@patchew.org; Sat, 28 Jul 2018 03:18:37 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45107) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fjJT2-0006HL-AV for qemu-devel@nongnu.org; Sat, 28 Jul 2018 03:16:45 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fjJSz-0007mM-7t for qemu-devel@nongnu.org; Sat, 28 Jul 2018 03:16:44 -0400 Received: from mx3-rdu2.redhat.com ([66.187.233.73]:60870 helo=mx1.redhat.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1fjJSz-0007l1-35 for qemu-devel@nongnu.org; Sat, 28 Jul 2018 03:16:41 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 562844026797; Sat, 28 Jul 2018 07:16:40 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-116-135.ams2.redhat.com [10.36.116.135]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 3015D7C23; Sat, 28 Jul 2018 07:16:39 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id A9CF011386C5; Sat, 28 Jul 2018 09:16:38 +0200 (CEST) From: Markus Armbruster To: qemu-devel@nongnu.org Date: Sat, 28 Jul 2018 09:16:36 +0200 Message-Id: <20180728071638.17077-2-armbru@redhat.com> In-Reply-To: <20180728071638.17077-1-armbru@redhat.com> References: <20180728071638.17077-1-armbru@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.11.54.5 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.6]); Sat, 28 Jul 2018 07:16:40 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.6]); Sat, 28 Jul 2018 07:16:40 +0000 (UTC) for IP:'10.11.54.5' DOMAIN:'int-mx05.intmail.prod.int.rdu2.redhat.com' HELO:'smtp.corp.redhat.com' FROM:'armbru@redhat.com' RCPT:'' X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 66.187.233.73 Subject: [Qemu-devel] [PULL v2 1/3] qstring: Fix qstring_from_substr() not to provoke int overflow 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: liujunjie Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: liujunjie qstring_from_substr() parameters @start and @end are of type int. blkdebug_parse_filename(), blkverify_parse_filename(), nbd_parse_uri(), and qstring_from_str() pass @end values of type size_t or ptrdiff_t. Values exceeding INT_MAX get truncated, with possibly disastrous results. Such huge substrings seem unlikely, but we found one in a core dump, where "info tlb" executed via QMP's human-monitor-command apparently produced 35 GiB of output. Fix by changing the parameters size_t. Signed-off-by: liujunjie Message-Id: <20180724134339.17832-1-liujunjie23@huawei.com> Reviewed-by: Markus Armbruster Signed-off-by: Markus Armbruster --- include/qapi/qmp/qstring.h | 2 +- qobject/qstring.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/qapi/qmp/qstring.h b/include/qapi/qmp/qstring.h index b3b3d444d2..3e83e3a95d 100644 --- a/include/qapi/qmp/qstring.h +++ b/include/qapi/qmp/qstring.h @@ -24,7 +24,7 @@ struct QString { =20 QString *qstring_new(void); QString *qstring_from_str(const char *str); -QString *qstring_from_substr(const char *str, int start, int end); +QString *qstring_from_substr(const char *str, size_t start, size_t end); size_t qstring_get_length(const QString *qstring); const char *qstring_get_str(const QString *qstring); const char *qstring_get_try_str(const QString *qstring); diff --git a/qobject/qstring.c b/qobject/qstring.c index afca54b47a..18b8eb82f8 100644 --- a/qobject/qstring.c +++ b/qobject/qstring.c @@ -37,7 +37,7 @@ size_t qstring_get_length(const QString *qstring) * * Return string reference */ -QString *qstring_from_substr(const char *str, int start, int end) +QString *qstring_from_substr(const char *str, size_t start, size_t end) { QString *qstring; =20 --=20 2.17.1 From nobody Wed Nov 5 02:32:12 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 (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1532762429476641.0262308417406; Sat, 28 Jul 2018 00:20:29 -0700 (PDT) Received: from localhost ([::1]:44162 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fjJWe-0000Wz-FM for importer@patchew.org; Sat, 28 Jul 2018 03:20:28 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45106) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fjJT2-0006HK-AK for qemu-devel@nongnu.org; Sat, 28 Jul 2018 03:16:45 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fjJSz-0007mE-73 for qemu-devel@nongnu.org; Sat, 28 Jul 2018 03:16:44 -0400 Received: from mx3-rdu2.redhat.com ([66.187.233.73]:39396 helo=mx1.redhat.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1fjJSz-0007ky-2w for qemu-devel@nongnu.org; Sat, 28 Jul 2018 03:16:41 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 24BFF7DAC3 for ; Sat, 28 Jul 2018 07:16:40 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-116-135.ams2.redhat.com [10.36.116.135]) by smtp.corp.redhat.com (Postfix) with ESMTPS id EC8EC2156701 for ; Sat, 28 Jul 2018 07:16:39 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id AED5A11385E4; Sat, 28 Jul 2018 09:16:38 +0200 (CEST) From: Markus Armbruster To: qemu-devel@nongnu.org Date: Sat, 28 Jul 2018 09:16:37 +0200 Message-Id: <20180728071638.17077-3-armbru@redhat.com> In-Reply-To: <20180728071638.17077-1-armbru@redhat.com> References: <20180728071638.17077-1-armbru@redhat.com> X-Scanned-By: MIMEDefang 2.78 on 10.11.54.6 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.2]); Sat, 28 Jul 2018 07:16:40 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.2]); Sat, 28 Jul 2018 07:16:40 +0000 (UTC) for IP:'10.11.54.6' DOMAIN:'int-mx06.intmail.prod.int.rdu2.redhat.com' HELO:'smtp.corp.redhat.com' FROM:'armbru@redhat.com' RCPT:'' X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 66.187.233.73 Subject: [Qemu-devel] [PULL v2 2/3] qstring: Assert size calculations don't overflow 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: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Signed-off-by: Markus Armbruster Message-Id: <20180727062204.10401-2-armbru@redhat.com> Reviewed-by: Eric Blake --- qobject/qstring.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/qobject/qstring.c b/qobject/qstring.c index 18b8eb82f8..1bb7784a88 100644 --- a/qobject/qstring.c +++ b/qobject/qstring.c @@ -41,17 +41,19 @@ QString *qstring_from_substr(const char *str, size_t st= art, size_t end) { QString *qstring; =20 + assert(start <=3D end + 1); + qstring =3D g_malloc(sizeof(*qstring)); qobject_init(QOBJECT(qstring), QTYPE_QSTRING); =20 qstring->length =3D end - start + 1; qstring->capacity =3D qstring->length; =20 + assert(qstring->capacity < SIZE_MAX); qstring->string =3D g_malloc(qstring->capacity + 1); memcpy(qstring->string, str + start, qstring->length); qstring->string[qstring->length] =3D 0; =20 - return qstring; } =20 @@ -68,7 +70,9 @@ QString *qstring_from_str(const char *str) static void capacity_increase(QString *qstring, size_t len) { if (qstring->capacity < (qstring->length + len)) { + assert(len <=3D SIZE_MAX - qstring->capacity); qstring->capacity +=3D len; + assert(qstring->capacity <=3D SIZE_MAX / 2); qstring->capacity *=3D 2; /* use exponential growth */ =20 qstring->string =3D g_realloc(qstring->string, qstring->capacity += 1); --=20 2.17.1 From nobody Wed Nov 5 02:32:12 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 (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1532762498920602.5258374283484; Sat, 28 Jul 2018 00:21:38 -0700 (PDT) Received: from localhost ([::1]:44169 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fjJXl-0001Bc-VL for importer@patchew.org; Sat, 28 Jul 2018 03:21:37 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45135) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fjJT4-0006Ha-3n for qemu-devel@nongnu.org; Sat, 28 Jul 2018 03:16:47 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fjJSz-0007mR-8R for qemu-devel@nongnu.org; Sat, 28 Jul 2018 03:16:46 -0400 Received: from mx3-rdu2.redhat.com ([66.187.233.73]:47368 helo=mx1.redhat.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1fjJSz-0007l0-30 for qemu-devel@nongnu.org; Sat, 28 Jul 2018 03:16:41 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 3D85840216E4 for ; Sat, 28 Jul 2018 07:16:40 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-116-135.ams2.redhat.com [10.36.116.135]) by smtp.corp.redhat.com (Postfix) with ESMTPS id EC0CD10FD2B2 for ; Sat, 28 Jul 2018 07:16:39 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id B23E911385FA; Sat, 28 Jul 2018 09:16:38 +0200 (CEST) From: Markus Armbruster To: qemu-devel@nongnu.org Date: Sat, 28 Jul 2018 09:16:38 +0200 Message-Id: <20180728071638.17077-4-armbru@redhat.com> In-Reply-To: <20180728071638.17077-1-armbru@redhat.com> References: <20180728071638.17077-1-armbru@redhat.com> X-Scanned-By: MIMEDefang 2.78 on 10.11.54.3 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.5]); Sat, 28 Jul 2018 07:16:40 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.5]); Sat, 28 Jul 2018 07:16:40 +0000 (UTC) for IP:'10.11.54.3' DOMAIN:'int-mx03.intmail.prod.int.rdu2.redhat.com' HELO:'smtp.corp.redhat.com' FROM:'armbru@redhat.com' RCPT:'' X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 66.187.233.73 Subject: [Qemu-devel] [PULL v2 3/3] qstring: Move qstring_from_substr()'s @end one to the right 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: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" qstring_from_substr() takes the index of the substring's first and last character. qstring_from_substr(s, 0, SIZE_MAX) denotes an empty substring. Awkward. Shift the end index one to the right. This simplifies both qstring_from_substr() and its callers. Signed-off-by: Markus Armbruster Reviewed-by: Eric Blake Message-Id: <20180727062204.10401-3-armbru@redhat.com> --- block/blkdebug.c | 2 +- block/blkverify.c | 2 +- block/nbd.c | 2 +- qobject/qstring.c | 6 +++--- tests/check-qobject.c | 2 +- tests/check-qstring.c | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/block/blkdebug.c b/block/blkdebug.c index 0457bf5b66..0759452925 100644 --- a/block/blkdebug.c +++ b/block/blkdebug.c @@ -305,7 +305,7 @@ static void blkdebug_parse_filename(const char *filenam= e, QDict *options, =20 if (c !=3D filename) { QString *config_path; - config_path =3D qstring_from_substr(filename, 0, c - filename - 1); + config_path =3D qstring_from_substr(filename, 0, c - filename); qdict_put(options, "config", config_path); } =20 diff --git a/block/blkverify.c b/block/blkverify.c index da97ee5927..89bf4386e3 100644 --- a/block/blkverify.c +++ b/block/blkverify.c @@ -80,7 +80,7 @@ static void blkverify_parse_filename(const char *filename= , QDict *options, } =20 /* TODO Implement option pass-through and set raw.filename here */ - raw_path =3D qstring_from_substr(filename, 0, c - filename - 1); + raw_path =3D qstring_from_substr(filename, 0, c - filename); qdict_put(options, "x-raw", raw_path); =20 /* TODO Allow multi-level nesting and set file.filename here */ diff --git a/block/nbd.c b/block/nbd.c index b198ad775f..e87699fb73 100644 --- a/block/nbd.c +++ b/block/nbd.c @@ -109,7 +109,7 @@ static int nbd_parse_uri(const char *filename, QDict *o= ptions) /* strip braces from literal IPv6 address */ if (uri->server[0] =3D=3D '[') { host =3D qstring_from_substr(uri->server, 1, - strlen(uri->server) - 2); + strlen(uri->server) - 1); } else { host =3D qstring_from_str(uri->server); } diff --git a/qobject/qstring.c b/qobject/qstring.c index 1bb7784a88..0f1510e792 100644 --- a/qobject/qstring.c +++ b/qobject/qstring.c @@ -41,12 +41,12 @@ QString *qstring_from_substr(const char *str, size_t st= art, size_t end) { QString *qstring; =20 - assert(start <=3D end + 1); + assert(start <=3D end); =20 qstring =3D g_malloc(sizeof(*qstring)); qobject_init(QOBJECT(qstring), QTYPE_QSTRING); =20 - qstring->length =3D end - start + 1; + qstring->length =3D end - start; qstring->capacity =3D qstring->length; =20 assert(qstring->capacity < SIZE_MAX); @@ -64,7 +64,7 @@ QString *qstring_from_substr(const char *str, size_t star= t, size_t end) */ QString *qstring_from_str(const char *str) { - return qstring_from_substr(str, 0, strlen(str) - 1); + return qstring_from_substr(str, 0, strlen(str)); } =20 static void capacity_increase(QString *qstring, size_t len) diff --git a/tests/check-qobject.c b/tests/check-qobject.c index 16ccbde82c..593c3a0618 100644 --- a/tests/check-qobject.c +++ b/tests/check-qobject.c @@ -154,7 +154,7 @@ static void qobject_is_equal_string_test(void) str_case =3D qstring_from_str("Foo"); =20 /* Should yield "foo" */ - str_built =3D qstring_from_substr("form", 0, 1); + str_built =3D qstring_from_substr("form", 0, 2); qstring_append_chr(str_built, 'o'); =20 check_unequal(str_base, str_whitespace_0, str_whitespace_1, diff --git a/tests/check-qstring.c b/tests/check-qstring.c index f11a7a8605..2d079921e3 100644 --- a/tests/check-qstring.c +++ b/tests/check-qstring.c @@ -66,7 +66,7 @@ static void qstring_from_substr_test(void) { QString *qs; =20 - qs =3D qstring_from_substr("virtualization", 3, 9); + qs =3D qstring_from_substr("virtualization", 3, 10); g_assert(qs !=3D NULL); g_assert(strcmp(qstring_get_str(qs), "tualiza") =3D=3D 0); =20 --=20 2.17.1