From: Marcelo Tosatti <mtosatti@redhat.com>
To: avi@redhat.com
Cc: kvm@vger.kernel.org, mst@redhat.com, gleb@redhat.com,
Marcelo Tosatti <mtosatti@redhat.com>
Subject: [patch 2/3] KVM: x86: disallow KVM_{SET,GET}_LAPIC without allocated in-kernel lapic
Date: Thu, 29 Oct 2009 13:44:16 -0200 [thread overview]
Message-ID: <20091029154553.814210695@amt.cnet> (raw)
In-Reply-To: 20091029154414.686484229@amt.cnet
[-- Attachment #1: get-set-lapic --]
[-- Type: text/plain, Size: 769 bytes --]
Otherwise kvm might attempt to dereference a NULL pointer.
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
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)
next prev parent reply other threads:[~2009-10-29 15:48 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-10-27 15:10 [patch 0/3] ioctl fixes Marcelo Tosatti
2009-10-27 15:10 ` [patch 1/3] KVM: x86: disallow multiple KVM_CREATE_IRQCHIP Marcelo Tosatti
2009-10-27 17:49 ` Michael S. Tsirkin
2009-10-27 15:10 ` [patch 2/3] KVM: x86: disallow KVM_{SET,GET}_LAPIC without in kernel irqchip Marcelo Tosatti
2009-10-27 17:50 ` Michael S. Tsirkin
2009-10-28 9:32 ` Avi Kivity
2009-10-28 10:20 ` Michael S. Tsirkin
2009-10-28 10:30 ` Gleb Natapov
2009-10-28 10:32 ` Michael S. Tsirkin
2009-10-28 10:39 ` Gleb Natapov
2009-10-28 10:34 ` Avi Kivity
2009-10-27 15:10 ` [patch 3/3] KVM: only clear irq_source_id if irqchip is present Marcelo Tosatti
2009-10-28 20:42 ` [patch 0/3] ioctl fixes v2 Marcelo Tosatti
2009-10-28 20:42 ` [patch 1/3] KVM: x86: disallow multiple KVM_CREATE_IRQCHIP Marcelo Tosatti
2009-10-29 9:32 ` Michael S. Tsirkin
2009-10-29 14:10 ` Marcelo Tosatti
2009-10-28 20:42 ` [patch 2/3] KVM: x86: disallow KVM_{SET,GET}_LAPIC without allocated in-kernel lapic Marcelo Tosatti
2009-10-28 20:42 ` [patch 3/3] KVM: only clear irq_source_id if irqchip is present Marcelo Tosatti
2009-10-29 15:44 ` [patch 0/3] ioctl fixes v3 Marcelo Tosatti
2009-10-29 15:44 ` [patch 1/3] KVM: x86: disallow multiple KVM_CREATE_IRQCHIP Marcelo Tosatti
2009-10-29 15:44 ` Marcelo Tosatti [this message]
2009-10-29 15:44 ` [patch 3/3] KVM: only clear irq_source_id if irqchip is present Marcelo Tosatti
2009-11-02 9:53 ` [patch 0/3] ioctl fixes v3 Avi Kivity
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20091029154553.814210695@amt.cnet \
--to=mtosatti@redhat.com \
--cc=avi@redhat.com \
--cc=gleb@redhat.com \
--cc=kvm@vger.kernel.org \
--cc=mst@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox