From patchwork Mon Jul 22 21:07:34 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laszlo Ersek X-Patchwork-Id: 260805 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 6E5A02C0040 for ; Tue, 23 Jul 2013 07:34:41 +1000 (EST) Received: from localhost ([::1]:42848 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V1Nkd-0001uU-8L for incoming@patchwork.ozlabs.org; Mon, 22 Jul 2013 17:34:39 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52949) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V1NkL-0001qV-3T for qemu-devel@nongnu.org; Mon, 22 Jul 2013 17:34:24 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1V1NkI-0001B5-CK for qemu-devel@nongnu.org; Mon, 22 Jul 2013 17:34:21 -0400 Received: from mx1.redhat.com ([209.132.183.28]:56059) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V1NIE-0000F8-Dh for qemu-devel@nongnu.org; Mon, 22 Jul 2013 17:05:18 -0400 Received: from int-mx12.intmail.prod.int.phx2.redhat.com (int-mx12.intmail.prod.int.phx2.redhat.com [10.5.11.25]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id r6ML5Het014049 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Mon, 22 Jul 2013 17:05:18 -0400 Received: from lacos-laptop.usersys.redhat.com (vpn-58-163.rdu2.redhat.com [10.10.58.163]) by int-mx12.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id r6ML59Mm027345 for ; Mon, 22 Jul 2013 17:05:17 -0400 From: Laszlo Ersek To: qemu-devel@nongnu.org Date: Mon, 22 Jul 2013 23:07:34 +0200 Message-Id: <1374527256-27631-7-git-send-email-lersek@redhat.com> In-Reply-To: <1374527256-27631-1-git-send-email-lersek@redhat.com> References: <1374527256-27631-1-git-send-email-lersek@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.25 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH 6/8] OptsVisitor: don't try to flatten overlong integer ranges X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Prevent mistyped command line options from incurring high memory and CPU usage at startup. 64K elements in a range should be enough for everyone (TM). The OPTS_VISITOR_RANGE_MAX macro is public so that unit tests can construct corner cases with it. Signed-off-by: Laszlo Ersek --- include/qapi/opts-visitor.h | 6 ++++++ qapi/opts-visitor.c | 7 +++++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/include/qapi/opts-visitor.h b/include/qapi/opts-visitor.h index 5939eee..fd48c14 100644 --- a/include/qapi/opts-visitor.h +++ b/include/qapi/opts-visitor.h @@ -16,6 +16,12 @@ #include "qapi/visitor.h" #include "qemu/option.h" +/* Inclusive upper bound on the size of any flattened range. This is a safety + * (= anti-annoyance) measure; wrong ranges should not cause long startup + * delays nor exhaust virtual memory. + */ +#define OPTS_VISITOR_RANGE_MAX 65536 + typedef struct OptsVisitor OptsVisitor; /* Contrarily to qemu-option.c::parse_option_number(), OptsVisitor's "int" diff --git a/qapi/opts-visitor.c b/qapi/opts-visitor.c index d54d373..96ed858 100644 --- a/qapi/opts-visitor.c +++ b/qapi/opts-visitor.c @@ -384,7 +384,9 @@ opts_type_int(Visitor *v, int64_t *obj, const char *name, Error **errp) str = endptr + 1; val2 = strtoll(str, &endptr, 0); if (errno == 0 && endptr > str && *endptr == '\0' && - INT64_MIN <= val2 && val2 <= INT64_MAX && val <= val2) { + INT64_MIN <= val2 && val2 <= INT64_MAX && val <= val2 && + (val > INT64_MAX - OPTS_VISITOR_RANGE_MAX || + val2 < val + OPTS_VISITOR_RANGE_MAX)) { ov->range_next.s = val; ov->range_limit.s = val2; ov->list_mode = LM_SIGNED_INTERVAL; @@ -435,7 +437,8 @@ opts_type_uint64(Visitor *v, uint64_t *obj, const char *name, Error **errp) str = endptr + 1; if (parse_uint_full(str, &val2, 0) == 0 && - val2 <= UINT64_MAX && val <= val2) { + val2 <= UINT64_MAX && val <= val2 && + val2 - val < OPTS_VISITOR_RANGE_MAX) { ov->range_next.u = val; ov->range_limit.u = val2; ov->list_mode = LM_UNSIGNED_INTERVAL;