From 624a42cc67a592526c60a93dbcf0a1ed39b58814 Mon Sep 17 00:00:00 2001 From: Marcelo Tosatti Date: Wed, 2 Jun 2010 11:26:26 -0300 Subject: [PATCH] KVM: read apic->irr with ioapic lock held Read ioapic->irr inside ioapic->lock protected section. KVM-Stable-Tag Signed-off-by: Marcelo Tosatti (cherry picked from comit 07dc7263b99e4ddad2b4c69765a428ccb7d48938) --- virt/kvm/ioapic.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/virt/kvm/ioapic.c b/virt/kvm/ioapic.c index 38a2d20b89de..fc4a7e3dd724 100644 --- a/virt/kvm/ioapic.c +++ b/virt/kvm/ioapic.c @@ -177,12 +177,13 @@ static int ioapic_deliver(struct kvm_ioapic *ioapic, int irq) int kvm_ioapic_set_irq(struct kvm_ioapic *ioapic, int irq, int level) { - u32 old_irr = ioapic->irr; + u32 old_irr; u32 mask = 1 << irq; union kvm_ioapic_redirect_entry entry; int ret = 1; mutex_lock(&ioapic->lock); + old_irr = ioapic->irr; if (irq >= 0 && irq < IOAPIC_NUM_PINS) { entry = ioapic->redirtbl[irq]; level ^= entry.fields.polarity; -- 2.39.5