From: Avi Kivity <avi@redhat.com>
Date: Fri, 18 Sep 2009 20:29:28 +0000 (-0300)
Subject: KVM: Protect update_cr8_intercept() when running without an apic
X-Git-Tag: v2.6.31.2~60
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=c3443b436a0767cbc0d4ab405f8fa13fb34bd56c;p=karo-tx-linux.git

KVM: Protect update_cr8_intercept() when running without an apic

(cherry picked from commit 88c808fd42b53a7e01a2ac3253ef31fef74cb5af)

update_cr8_intercept() can be triggered from userspace while there
is no apic present.

Signed-off-by: Avi Kivity <avi@redhat.com>
Cc: Marcelo Tosatti <mtosatti@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---

diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
index a30e2858a767..e27054b8df8c 100644
--- a/arch/x86/kvm/x86.c
+++ b/arch/x86/kvm/x86.c
@@ -3202,6 +3202,9 @@ static void update_cr8_intercept(struct kvm_vcpu *vcpu)
 	if (!kvm_x86_ops->update_cr8_intercept)
 		return;
 
+	if (!vcpu->arch.apic)
+		return;
+
 	if (!vcpu->arch.apic->vapic_addr)
 		max_irr = kvm_lapic_find_highest_irr(vcpu);
 	else