diff options
| author | Chen Gang <gang.chen.5i5j@gmail.com> | 2014-08-08 17:37:59 +0200 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2014-08-19 15:12:28 +0200 |
| commit | 30d1e0e806e5b2fadc297ba78f2d7afd6ba309cf (patch) | |
| tree | 4391c372692bdc139411f68400ba950d47f852c2 /virt/kvm/assigned-dev.c | |
| parent | Revert "KVM: x86: Increase the number of fixed MTRR regs to 10" (diff) | |
| download | linux-30d1e0e806e5b2fadc297ba78f2d7afd6ba309cf.tar.xz linux-30d1e0e806e5b2fadc297ba78f2d7afd6ba309cf.zip | |
virt/kvm/assigned-dev.c: Set 'dev->irq_source_id' to '-1' after free it
As a generic function, deassign_guest_irq() assumes it can be called
even if assign_guest_irq() is not be called successfully (which can be
triggered by ioctl from user mode, indirectly).
So for assign_guest_irq() failure process, need set 'dev->irq_source_id'
to -1 after free 'dev->irq_source_id', or deassign_guest_irq() may free
it again.
Signed-off-by: Chen Gang <gang.chen.5i5j@gmail.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'virt/kvm/assigned-dev.c')
| -rw-r--r-- | virt/kvm/assigned-dev.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/virt/kvm/assigned-dev.c b/virt/kvm/assigned-dev.c index bf06577fea51..5819a2708d7e 100644 --- a/virt/kvm/assigned-dev.c +++ b/virt/kvm/assigned-dev.c @@ -526,8 +526,10 @@ static int assign_guest_irq(struct kvm *kvm, dev->irq_requested_type |= guest_irq_type; if (dev->ack_notifier.gsi != -1) kvm_register_irq_ack_notifier(kvm, &dev->ack_notifier); - } else + } else { kvm_free_irq_source_id(kvm, dev->irq_source_id); + dev->irq_source_id = -1; + } return r; } |