From patchwork Tue Jul 7 11:11:00 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pavel Fedin X-Patchwork-Id: 6732141 Return-Path: X-Original-To: patchwork-kvm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id CFAEAC05AC for ; Tue, 7 Jul 2015 11:11:32 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 156092060E for ; Tue, 7 Jul 2015 11:11:32 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 2A5E32060C for ; Tue, 7 Jul 2015 11:11:31 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756624AbbGGLLZ (ORCPT ); Tue, 7 Jul 2015 07:11:25 -0400 Received: from mailout1.w1.samsung.com ([210.118.77.11]:58956 "EHLO mailout1.w1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754218AbbGGLLI (ORCPT ); Tue, 7 Jul 2015 07:11:08 -0400 Received: from eucpsbgm1.samsung.com (unknown [203.254.199.244]) by mailout1.w1.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0 64bit (built May 5 2014)) with ESMTP id <0NR4003UB72IIV80@mailout1.w1.samsung.com> for kvm@vger.kernel.org; Tue, 07 Jul 2015 12:11:06 +0100 (BST) X-AuditID: cbfec7f4-f79c56d0000012ee-ed-559bb3ca373b Received: from eusync2.samsung.com ( [203.254.199.212]) by eucpsbgm1.samsung.com (EUCPMTA) with SMTP id D1.86.04846.AC3BB955; Tue, 7 Jul 2015 12:11:06 +0100 (BST) Received: from fedinw7x64.rnd.samsung.ru ([106.109.131.169]) by eusync2.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0 64bit (built May 5 2014)) with ESMTPA id <0NR400LS472DTO10@eusync2.samsung.com>; Tue, 07 Jul 2015 12:11:06 +0100 (BST) From: Pavel Fedin To: kvmarm@lists.cs.columbia.edu, kvm@vger.kernel.org Cc: Christoffer Dall , Marc Zyngier Subject: [PATCH 1/2] Fix NULL pointer dereferences if KVM is used without in-kernel irqchip Date: Tue, 07 Jul 2015 14:11:00 +0300 Message-id: <46c62639f325ef935c4ca24c5fc9d5eb2b4a0979.1436264839.git.p.fedin@samsung.com> X-Mailer: git-send-email 2.4.4 In-reply-to: References: In-reply-to: References: X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFprKLMWRmVeSWpSXmKPExsVy+t/xK7qnNs8ONdh9lMPixet/jBZzphZa fDx1nN3i751/bA4sHmvmrWH0uHNtD5vH+U1rmD0+b5ILYInisklJzcksSy3St0vgyujZfYGt 4DVbxZut/5gaGK+ydjFyckgImEgcftvJBGGLSVy4t56ti5GLQ0hgKaPEoVfPWSGcNiaJ1oXd bCBVbALqEqe/fmABsUUETCWe/3sLVMTBwSwQKfF8BthQYYFYiafTX7CAhFkEVCV+zEkGCfMK REu8mn+IHWKXnMSV69PBJnIKmEscm9cDFhcSMJO4euoZMy7xCYz8CxgZVjGKppYmFxQnpeca 6hUn5haX5qXrJefnbmKEBNaXHYyLj1kdYhTgYFTi4b0hMTtUiDWxrLgy9xCjBAezkgivbilQ iDclsbIqtSg/vqg0J7X4EKM0B4uSOO/cXe9DhATSE0tSs1NTC1KLYLJMHJxSDYxRZfpX368t 6tm50DZ9ntYLTe1L9490CQXzJOY75YXuEmWyefJv4usl66pq/PbPPbkvQ/jWFgYLE1GPQFEv dynBjF/hWeVpX//nqnSGieTqyT0ICpt3uPzAlI2H6nyMLyrnyZUk/PoRsPKdk++VoD8FE/7+ zbduOP/6+KWwu0ZezBoXTrgw7VdiKc5INNRiLipOBADUA2JzKAIAAA== Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Spam-Status: No, score=-7.7 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Makes qemu working again with kernel-irqchip=off option Signed-off-by: Pavel Fedin --- virt/kvm/arm/vgic.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/virt/kvm/arm/vgic.c b/virt/kvm/arm/vgic.c index 78fb820..3420657 100644 --- a/virt/kvm/arm/vgic.c +++ b/virt/kvm/arm/vgic.c @@ -100,6 +100,9 @@ static bool queue_sgi(struct kvm_vcpu *vcpu, int irq) int kvm_vgic_map_resources(struct kvm *kvm) { + if (!kvm->arch.vgic.vm_ops.map_resources) + return 0; + return kvm->arch.vgic.vm_ops.map_resources(kvm, vgic); } @@ -1637,7 +1640,7 @@ static int vgic_vcpu_init_maps(struct kvm_vcpu *vcpu, int nr_irqs) */ int kvm_vgic_get_max_vcpus(void) { - return vgic->max_gic_vcpus; + return vgic ? vgic->max_gic_vcpus : KVM_MAX_VCPUS; } void kvm_vgic_destroy(struct kvm *kvm)