Commit 316314ca authored by Paolo Bonzini's avatar Paolo Bonzini
Browse files

KVM: x86: mask CPUID(0xD,0x1).EAX against host value 



This ensures that the guest doesn't see XSAVE extensions
(e.g. xgetbv1 or xsavec) that the host lacks.

Cc: stable@vger.kernel.org
Reviewed-by: default avatarRadim Krčmář <rkrcmar@redhat.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent fc5b7f3b

arch/x86/kvm/cpuid.c

+1 −0
Original line number Diff line number Diff line
@@ -534,6 +534,7 @@ static inline int __do_cpuid_ent(struct kvm_cpuid_entry2 *entry, u32 function, 
			do_cpuid_1_ent(&entry[i], function, idx);

			if (idx == 1) {

				entry[i].eax &= kvm_cpuid_D_1_eax_x86_features;

				cpuid_mask(&entry[i].eax, CPUID_D_1_EAX);

				entry[i].ebx = 0;

				if (entry[i].eax & (F(XSAVES)|F(XSAVEC)))

					entry[i].ebx =