From patchwork Tue Oct 27 15:10:44 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcelo Tosatti X-Patchwork-Id: 56108 Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id n9RFET92014949 for ; Tue, 27 Oct 2009 15:14:29 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753741AbZJ0POW (ORCPT ); Tue, 27 Oct 2009 11:14:22 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753472AbZJ0POV (ORCPT ); Tue, 27 Oct 2009 11:14:21 -0400 Received: from mx1.redhat.com ([209.132.183.28]:8583 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753741AbZJ0POU (ORCPT ); Tue, 27 Oct 2009 11:14:20 -0400 Received: from int-mx08.intmail.prod.int.phx2.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id n9RFE3mD013269; Tue, 27 Oct 2009 11:14:03 -0400 Received: from ns3.rdu.redhat.com (ns3.rdu.redhat.com [10.11.255.199]) by int-mx08.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id n9RFE2pF014594; Tue, 27 Oct 2009 11:14:02 -0400 Received: from amt.cnet (vpn-10-14.str.redhat.com [10.32.10.14]) by ns3.rdu.redhat.com (8.13.8/8.13.8) with ESMTP id n9RFE0hm008908; Tue, 27 Oct 2009 11:14:01 -0400 Received: from amt.cnet (amt.cnet [127.0.0.1]) by amt.cnet (Postfix) with ESMTP id 936AA682A79; Tue, 27 Oct 2009 13:12:57 -0200 (BRST) Received: (from marcelo@localhost) by amt.cnet (8.14.3/8.14.3/Submit) id n9RFCoxF009435; Tue, 27 Oct 2009 13:12:50 -0200 Message-Id: <20091027151125.345664553@redhat.com> User-Agent: quilt/0.47-1 Date: Tue, 27 Oct 2009 13:10:44 -0200 From: Marcelo Tosatti To: avi@redhat.com Cc: kvm , stable@kernel.org, Marcelo Tosatti Subject: [patch 2/3] KVM: x86: disallow KVM_{SET, GET}_LAPIC without in kernel irqchip References: <20091027151042.118902183@redhat.com> Content-Disposition: inline; filename=get-set-lapic X-Scanned-By: MIMEDefang 2.67 on 10.5.11.21 Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org Index: kvm/arch/x86/kvm/x86.c =================================================================== --- kvm.orig/arch/x86/kvm/x86.c +++ kvm/arch/x86/kvm/x86.c @@ -1815,6 +1815,9 @@ long kvm_arch_vcpu_ioctl(struct file *fi switch (ioctl) { case KVM_GET_LAPIC: { + r = -EINVAL; + if (!irqchip_in_kernel(vcpu->kvm)) + goto out; lapic = kzalloc(sizeof(struct kvm_lapic_state), GFP_KERNEL); r = -ENOMEM; @@ -1830,6 +1833,9 @@ long kvm_arch_vcpu_ioctl(struct file *fi break; } case KVM_SET_LAPIC: { + r = -EINVAL; + if (!irqchip_in_kernel(vcpu->kvm)) + goto out; lapic = kmalloc(sizeof(struct kvm_lapic_state), GFP_KERNEL); r = -ENOMEM; if (!lapic)