On 29/07/2015 06:56, Wang Kai wrote: > From: Paolo Bonzini <[email protected]> > > commit ce40cd3fc7fa40a6119e5fe6c0f2bc0eb4541009 upstream. > > Malicious (or egregiously buggy) userspace can trigger it, but it > should never happen in normal operation. > > Signed-off-by: Paolo Bonzini <[email protected]> > [wangkai: backport to 3.10: adjust context] > Signed-off-by: Wang Kai <[email protected]> > --- > arch/x86/kvm/lapic.h | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/arch/x86/kvm/lapic.h b/arch/x86/kvm/lapic.h > index c8b0d0d..fc87568 100644 > --- a/arch/x86/kvm/lapic.h > +++ b/arch/x86/kvm/lapic.h > @@ -165,7 +165,7 @@ static inline u16 apic_logical_id(struct kvm_apic_map > *map, u32 ldr) > > static inline bool kvm_apic_has_events(struct kvm_vcpu *vcpu) > { > - return vcpu->arch.apic->pending_events; > + return kvm_vcpu_has_lapic(vcpu) && vcpu->arch.apic->pending_events; > } > > bool kvm_apic_pending_eoi(struct kvm_vcpu *vcpu, int vector); >
Ack. Paolo -- To unsubscribe from this list: send the line "unsubscribe stable" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
