KVM: ioapic: fix assignment of ioapic->rtc_status.pending_eoi (CVE-2014-0155)

[profile/ivi/kernel-x86-ivi.git] / virt / kvm / ioapic.c

diff --git a/virt/kvm/ioapic.c b/virt/kvm/ioapic.c
index ce9ed99..8c805a0 100644 (file)
--- a/virt/kvm/ioapic.c
+++ b/virt/kvm/ioapic.c
@@ -306,7 +306,7 @@ static int ioapic_deliver(struct kvm_ioapic *ioapic, int irq, bool line_status)
                BUG_ON(ioapic->rtc_status.pending_eoi != 0);
                ret = kvm_irq_delivery_to_apic(ioapic->kvm, NULL, &irqe,
                                ioapic->rtc_status.dest_map);
-               ioapic->rtc_status.pending_eoi = ret;
+               ioapic->rtc_status.pending_eoi = (ret < 0 ? 0 : ret);
        } else
                ret = kvm_irq_delivery_to_apic(ioapic->kvm, NULL, &irqe, NULL);