From patchwork Sun Jan 15 10:51:02 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shannon Zhao X-Patchwork-Id: 91525 Delivered-To: patch@linaro.org Received: by 10.140.20.99 with SMTP id 90csp955687qgi; Sun, 15 Jan 2017 02:52:55 -0800 (PST) X-Received: by 10.55.15.15 with SMTP id z15mr25628776qkg.264.1484477575954; Sun, 15 Jan 2017 02:52:55 -0800 (PST) Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id q15si12170647qtb.214.2017.01.15.02.52.55 for (version=TLS1 cipher=AES128-SHA bits=128/128); Sun, 15 Jan 2017 02:52:55 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Authentication-Results: mx.google.com; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom=qemu-devel-bounces+patch=linaro.org@nongnu.org Received: from localhost ([::1]:51055 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cSiQh-0003aa-Jo for patch@linaro.org; Sun, 15 Jan 2017 05:52:55 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52663) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cSiPU-0002pd-43 for qemu-devel@nongnu.org; Sun, 15 Jan 2017 05:51:40 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cSiPT-0006Ws-Iv for qemu-devel@nongnu.org; Sun, 15 Jan 2017 05:51:40 -0500 Received: from szxga03-in.huawei.com ([119.145.14.66]:47310) by eggs.gnu.org with esmtps (TLS1.0:RSA_ARCFOUR_SHA1:16) (Exim 4.71) (envelope-from ) id 1cSiPP-0006Ro-73; Sun, 15 Jan 2017 05:51:35 -0500 Received: from 172.24.1.36 (EHLO szxeml427-hub.china.huawei.com) ([172.24.1.36]) by szxrg03-dlp.huawei.com (MOS 4.4.3-GA FastPath queued) with ESMTP id COA63786; Sun, 15 Jan 2017 18:51:20 +0800 (CST) Received: from HGHY1Z002260041.china.huawei.com (10.177.16.142) by szxeml427-hub.china.huawei.com (10.82.67.182) with Microsoft SMTP Server id 14.3.235.1; Sun, 15 Jan 2017 18:51:11 +0800 From: Shannon Zhao To: , Date: Sun, 15 Jan 2017 18:51:02 +0800 Message-ID: <1484477462-14088-1-git-send-email-zhaoshenglong@huawei.com> X-Mailer: git-send-email 1.9.0.msysgit.0 MIME-Version: 1.0 X-Originating-IP: [10.177.16.142] X-CFilter-Loop: Reflected X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4.x-2.6.x [generic] [fuzzy] X-Received-From: 119.145.14.66 Subject: [Qemu-devel] [PATCH] arm: virt: Fix the segmentation fault when specifying an unsupported CPU 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: qemu-devel@nongnu.org, wu.wubin@huawei.com, zhaoshenglong@huawei.com Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Shannon Zhao For example, using -cpu generic will cause qemu segmentation fault. Signed-off-by: Shannon Zhao --- hw/arm/virt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.0.4 diff --git a/hw/arm/virt.c b/hw/arm/virt.c index 7a03f84..4b301c2 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -175,7 +175,7 @@ static bool cpuname_valid(const char *cpu) int i; for (i = 0; i < ARRAY_SIZE(valid_cpus); i++) { - if (strcmp(cpu, valid_cpus[i]) == 0) { + if (valid_cpus[i] != NULL && strcmp(cpu, valid_cpus[i]) == 0) { return true; } }