diff options
| author | Avi Kivity <avi@redhat.com> | 2012-03-05 14:23:29 +0200 |
|---|---|---|
| committer | Markus Lehtonen <markus.lehtonen@linux.intel.com> | 2013-04-05 09:09:33 +0300 |
| commit | 5e146dc0585a58c58246f751874df97849e3ea5b (patch) | |
| tree | 8a866fba6e031c2b0024cf1dc736bb89c4993342 /virt/kvm | |
| parent | 5aa3b2cf36c3e31a591a0a42dddafa16b255e8b7 (diff) | |
| download | kernel-mfld-blackbay-5e146dc0585a58c58246f751874df97849e3ea5b.tar.gz kernel-mfld-blackbay-5e146dc0585a58c58246f751874df97849e3ea5b.tar.bz2 kernel-mfld-blackbay-5e146dc0585a58c58246f751874df97849e3ea5b.zip | |
KVM: Ensure all vcpus are consistent with in-kernel irqchip settings
(cherry picked from commit 3e515705a1f46beb1c942bb8043c16f8ac7b1e9e)
If some vcpus are created before KVM_CREATE_IRQCHIP, then
irqchip_in_kernel() and vcpu->arch.apic will be inconsistent, leading
to potential NULL pointer dereferences.
Fix by:
- ensuring that no vcpus are installed when KVM_CREATE_IRQCHIP is called
- ensuring that a vcpu has an apic if it is installed after KVM_CREATE_IRQCHIP
This is somewhat long winded because vcpu->arch.apic is created without
kvm->lock held.
Based on earlier patch by Michael Ellerman.
Signed-off-by: Michael Ellerman <michael@ellerman.id.au>
Signed-off-by: Avi Kivity <avi@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Diffstat (limited to 'virt/kvm')
| -rw-r--r-- | virt/kvm/kvm_main.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c index 6b39ba9540e..8f27669cf4f 100644 --- a/virt/kvm/kvm_main.c +++ b/virt/kvm/kvm_main.c @@ -1619,6 +1619,10 @@ static int kvm_vm_ioctl_create_vcpu(struct kvm *kvm, u32 id) return r; mutex_lock(&kvm->lock); + if (!kvm_vcpu_compatible(vcpu)) { + r = -EINVAL; + goto unlock_vcpu_destroy; + } if (atomic_read(&kvm->online_vcpus) == KVM_MAX_VCPUS) { r = -EINVAL; goto vcpu_destroy; |