From patchwork Wed Oct 28 20:42:39 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcelo Tosatti X-Patchwork-Id: 56355 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 n9SKka8I006718 for ; Wed, 28 Oct 2009 20:46:36 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755598AbZJ1Uq0 (ORCPT ); Wed, 28 Oct 2009 16:46:26 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1755591AbZJ1Uq0 (ORCPT ); Wed, 28 Oct 2009 16:46:26 -0400 Received: from mx1.redhat.com ([209.132.183.28]:36543 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755564AbZJ1UqY (ORCPT ); Wed, 28 Oct 2009 16:46:24 -0400 Received: from int-mx05.intmail.prod.int.phx2.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.18]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id n9SKkTIb009575 for ; Wed, 28 Oct 2009 16:46:30 -0400 Received: from ns3.rdu.redhat.com (ns3.rdu.redhat.com [10.11.255.199]) by int-mx05.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id n9SKkTI2011444; Wed, 28 Oct 2009 16:46:29 -0400 Received: from amt.cnet (vpn-10-90.str.redhat.com [10.32.10.90]) by ns3.rdu.redhat.com (8.13.8/8.13.8) with ESMTP id n9SKkRA8021105; Wed, 28 Oct 2009 16:46:28 -0400 Received: from amt.cnet (amt.cnet [127.0.0.1]) by amt.cnet (Postfix) with ESMTP id AF22158815C; Wed, 28 Oct 2009 18:45:16 -0200 (BRST) Received: (from marcelo@localhost) by amt.cnet (8.14.3/8.14.3/Submit) id n9SKjFfi017740; Wed, 28 Oct 2009 18:45:15 -0200 Message-Id: <20091028204359.820155370@amt.cnet> User-Agent: quilt/0.47-1 Date: Wed, 28 Oct 2009 18:42:39 -0200 From: Marcelo Tosatti To: avi@redhat.com Cc: kvm@vger.kernel.org, mst@redhat.com, gleb@redhat.com, Marcelo Tosatti Subject: [patch 2/3] KVM: x86: disallow KVM_{SET, GET}_LAPIC without allocated in-kernel lapic References: <20091028204237.663479892@amt.cnet> Content-Disposition: inline; filename=get-set-lapic X-Scanned-By: MIMEDefang 2.67 on 10.5.11.18 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 @@ -1893,6 +1893,9 @@ long kvm_arch_vcpu_ioctl(struct file *fi switch (ioctl) { case KVM_GET_LAPIC: { + r = -EINVAL; + if (!vcpu->arch.apic) + goto out; lapic = kzalloc(sizeof(struct kvm_lapic_state), GFP_KERNEL); r = -ENOMEM; @@ -1908,6 +1911,9 @@ long kvm_arch_vcpu_ioctl(struct file *fi break; } case KVM_SET_LAPIC: { + r = -EINVAL; + if (!vcpu->arch.apic) + goto out; lapic = kmalloc(sizeof(struct kvm_lapic_state), GFP_KERNEL); r = -ENOMEM; if (!lapic)