diff options
| author | Wei Yongjun <yjwei@cn.fujitsu.com> | 2010-02-09 03:41:56 +0100 |
|---|---|---|
| committer | Marcelo Tosatti <mtosatti@redhat.com> | 2010-03-01 16:36:10 +0100 |
| commit | 4b7bb9210047fe880bb71e6273c3a4526799dbd7 (patch) | |
| tree | ca3de4c61fa42b4a09930646741d5cd17c194379 /arch/ia64/kvm | |
| parent | KVM: cleanup the failure path of KVM_CREATE_IRQCHIP ioctrl (diff) | |
| download | linux-4b7bb9210047fe880bb71e6273c3a4526799dbd7.tar.xz linux-4b7bb9210047fe880bb71e6273c3a4526799dbd7.zip | |
KVM: ia64: destroy ioapic device if fail to setup default irq routing
If KVM_CREATE_IRQCHIP fail due to kvm_setup_default_irq_routing(),
ioapic device is not destroyed and kvm->arch.vioapic is not set to
NULL, this may cause KVM_GET_IRQCHIP and KVM_SET_IRQCHIP access to
unexcepted memory.
Signed-off-by: Wei Yongjun <yjwei@cn.fujitsu.com>
Signed-off-by: Avi Kivity <avi@redhat.com>
Diffstat (limited to 'arch/ia64/kvm')
| -rw-r--r-- | arch/ia64/kvm/kvm-ia64.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/ia64/kvm/kvm-ia64.c b/arch/ia64/kvm/kvm-ia64.c index 06188988ed27..26e0e089bfe7 100644 --- a/arch/ia64/kvm/kvm-ia64.c +++ b/arch/ia64/kvm/kvm-ia64.c @@ -968,7 +968,7 @@ long kvm_arch_vm_ioctl(struct file *filp, goto out; r = kvm_setup_default_irq_routing(kvm); if (r) { - kfree(kvm->arch.vioapic); + kvm_ioapic_destroy(kvm); goto out; } break; |