KVM: x86: #GP when attempts to write reserved bits of Variable Range MTRRs

[deliverable/linux.git] / arch / x86 / kvm / x86.c

diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
index fb3ea7aad0c10ac23a919c4846485803dc7f1e66..737b4bdac41c0010c9470aba72678e6175207b5b 100644 (file)
--- a/arch/x86/kvm/x86.c
+++ b/arch/x86/kvm/x86.c
@@ -1726,6 +1726,7 @@ static bool valid_mtrr_type(unsigned t)
 static bool mtrr_valid(struct kvm_vcpu *vcpu, u32 msr, u64 data)
 {
        int i;
+       u64 mask = 0;
 
        if (!msr_mtrr_valid(msr))
                return false;
@@ -1749,10 +1750,21 @@ 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)
+       for (i = 63; i > boot_cpu_data.x86_phys_bits; i--)
+               mask |= (1ULL << i);
+       if ((msr & 1) == 0) {
                /* MTRR base */
-               return valid_mtrr_type(data & 0xff);
-       /* MTRR mask */
+               if (!valid_mtrr_type(data & 0xff))
+                       return false;
+               mask |= 0xf00;
+       } else
+               /* MTRR mask */
+               mask |= 0x7ff;
+       if (data & mask) {
+               kvm_inject_gp(vcpu, 0);
+               return false;
+       }
+
        return true;
 }