Commit adfb5d27 authored Aug 19, 2014 by Wanpeng Li Committed by Paolo Bonzini Aug 19, 2014

KVM: x86: fix check legal type of Variable Range MTRRs

The first entry in each pair(IA32_MTRR_PHYSBASEn) defines the base
address and memory type for the range; the second entry(IA32_MTRR_PHYSMASKn)
contains a mask used to determine the address range. The legal values
for the type field of IA32_MTRR_PHYSBASEn are 0,1,4,5, and 6. However,
IA32_MTRR_PHYSMASKn don't have type field. This patch avoid check if
the type field is legal for IA32_MTRR_PHYSMASKn.

Signed-off-by: Wanpeng Li <wanpeng.li@linux.intel.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>

parent 3b63a43f

arch/x86/kvm/x86.c

+7 −1

Original line number	Diff line number	Diff line
		@@ -1747,7 +1747,13 @@ static bool mtrr_valid(struct kvm_vcpu *vcpu, u32 msr, u64 data)
		}

		/* variable MTRRs */
		WARN_ON(!(msr >= 0x200 && msr < 0x200 + 2 * KVM_NR_VAR_MTRR));

		if ((msr & 1) == 0)
		/* MTRR base */
		return valid_mtrr_type(data & 0xff);
		/* MTRR mask */
		return true;
		}

		static int set_msr_mtrr(struct kvm_vcpu *vcpu, u32 msr, u64 data)

Admin message