Commit e50212bb authored by Marcelo Tosatti's avatar Marcelo Tosatti Committed by Avi Kivity

KVM: only clear irq_source_id if irqchip is present

Otherwise kvm might attempt to dereference a NULL pointer.
Signed-off-by: default avatarMarcelo Tosatti <mtosatti@redhat.com>
Signed-off-by: default avatarAvi Kivity <avi@redhat.com>
parent 2204ae3c
...@@ -243,6 +243,10 @@ void kvm_free_irq_source_id(struct kvm *kvm, int irq_source_id) ...@@ -243,6 +243,10 @@ void kvm_free_irq_source_id(struct kvm *kvm, int irq_source_id)
printk(KERN_ERR "kvm: IRQ source ID out of range!\n"); printk(KERN_ERR "kvm: IRQ source ID out of range!\n");
goto unlock; goto unlock;
} }
clear_bit(irq_source_id, &kvm->arch.irq_sources_bitmap);
if (!irqchip_in_kernel(kvm))
goto unlock;
for (i = 0; i < KVM_IOAPIC_NUM_PINS; i++) { for (i = 0; i < KVM_IOAPIC_NUM_PINS; i++) {
clear_bit(irq_source_id, &kvm->arch.vioapic->irq_states[i]); clear_bit(irq_source_id, &kvm->arch.vioapic->irq_states[i]);
if (i >= 16) if (i >= 16)
...@@ -251,7 +255,6 @@ void kvm_free_irq_source_id(struct kvm *kvm, int irq_source_id) ...@@ -251,7 +255,6 @@ void kvm_free_irq_source_id(struct kvm *kvm, int irq_source_id)
clear_bit(irq_source_id, &pic_irqchip(kvm)->irq_states[i]); clear_bit(irq_source_id, &pic_irqchip(kvm)->irq_states[i]);
#endif #endif
} }
clear_bit(irq_source_id, &kvm->arch.irq_sources_bitmap);
unlock: unlock:
mutex_unlock(&kvm->irq_lock); mutex_unlock(&kvm->irq_lock);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment