diff mbox

[4/8] KVM: x86: fix x2apic logical address matching

Message ID 1422568135-28402-5-git-send-email-rkrcmar@redhat.com (mailing list archive)
State New, archived
Headers show

Commit Message

Radim Krčmář Jan. 29, 2015, 9:48 p.m. UTC 
We cannot hit the bug now, but future patches will expose this path.

Signed-off-by: Radim Kr?má? <rkrcmar@redhat.com>
---
 arch/x86/kvm/lapic.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
diff mbox

Patch

diff --git a/arch/x86/kvm/lapic.c b/arch/x86/kvm/lapic.c
index 0ee743c6b4f1..aae043f38548 100644
--- a/arch/x86/kvm/lapic.c
+++ b/arch/x86/kvm/lapic.c
@@ -602,7 +602,8 @@  static bool kvm_apic_match_logical_addr(struct kvm_lapic *apic, u32 mda)
 	logical_id = kvm_apic_get_reg(apic, APIC_LDR);
 
 	if (apic_x2apic_mode(apic))
-		return logical_id & mda;
+		return ((logical_id >> 16) == (mda >> 16))
+		       && (logical_id & mda & 0xffff);
 
 	logical_id = GET_APIC_LOGICAL_ID(logical_id);