From patchwork Wed Jan 16 18:28:50 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eduardo Habkost X-Patchwork-Id: 212943 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id D82412C0092 for ; Thu, 17 Jan 2013 05:27:48 +1100 (EST) Received: from localhost ([::1]:42240 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TvXiE-00073q-Vw for incoming@patchwork.ozlabs.org; Wed, 16 Jan 2013 13:27:46 -0500 Received: from eggs.gnu.org ([208.118.235.92]:41508) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TvXhu-0006vL-CU for qemu-devel@nongnu.org; Wed, 16 Jan 2013 13:27:29 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TvXht-0008J4-5L for qemu-devel@nongnu.org; Wed, 16 Jan 2013 13:27:26 -0500 Received: from mx1.redhat.com ([209.132.183.28]:29668) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TvXhs-0008Id-Sd for qemu-devel@nongnu.org; Wed, 16 Jan 2013 13:27:25 -0500 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 r0GIRNGL032142 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Wed, 16 Jan 2013 13:27:23 -0500 Received: from blackpad.lan.raisama.net (vpn1-7-107.gru2.redhat.com [10.97.7.107]) by int-mx12.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id r0GIRMNd013232; Wed, 16 Jan 2013 13:27:22 -0500 Received: by blackpad.lan.raisama.net (Postfix, from userid 500) id D72092023A6; Wed, 16 Jan 2013 16:28:59 -0200 (BRST) From: Eduardo Habkost To: qemu-devel@nongnu.org, Anthony Liguori Date: Wed, 16 Jan 2013 16:28:50 -0200 Message-Id: <1358360933-5323-6-git-send-email-ehabkost@redhat.com> In-Reply-To: <1358360933-5323-1-git-send-email-ehabkost@redhat.com> References: <1358360933-5323-1-git-send-email-ehabkost@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 Cc: Chegu Vinod Subject: [Qemu-devel] [PATCH 5/8] vl.c: numa_add(): Validate nodeid before using it 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 Without this check, QEMU will corrupt memory if a too-large nodeid is provided in the command-line. e.g.: -numa node,mem=...,cpus=...,nodeid=65 This changes nodenr to unsigned long long, to avoid integer conversion issues when converting the strtoull() result to int. Signed-off-by: Eduardo Habkost --- Changes v2: - Implement change without creation of numa_node_add() function Changes v3: - Fix fprintf() format to use "%llu" for unsigned long long nodenr --- vl.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/vl.c b/vl.c index dabbba1..b39cd9a 100644 --- a/vl.c +++ b/vl.c @@ -1246,7 +1246,7 @@ static void numa_add(const char *optarg) char option[128]; char *endptr; unsigned long long value, endvalue; - int nodenr; + unsigned long long nodenr; value = endvalue = 0ULL; @@ -1267,6 +1267,11 @@ static void numa_add(const char *optarg) nodenr = strtoull(option, NULL, 10); } + if (nodenr >= MAX_NODES) { + fprintf(stderr, "qemu: invalid NUMA nodeid: %llu\n", nodenr); + exit(1); + } + if (get_param_value(option, 128, "mem", optarg) == 0) { node_mem[nodenr] = 0; } else {