diff options
| author | Wanpeng Li | 2014-08-19 11:04:40 +0200 |
|---|---|---|
| committer | Paolo Bonzini | 2014-08-19 15:12:29 +0200 |
| commit | d7a2a246a1b5a0b0c803e800019600051e1e6f1a (patch) | |
| tree | 6702c15304c2ff216987c809dd787800ca13d22c | |
| parent | KVM: x86: fix check legal type of Variable Range MTRRs (diff) | |
| download | kernel-qcow2-linux-d7a2a246a1b5a0b0c803e800019600051e1e6f1a.tar.gz kernel-qcow2-linux-d7a2a246a1b5a0b0c803e800019600051e1e6f1a.tar.xz kernel-qcow2-linux-d7a2a246a1b5a0b0c803e800019600051e1e6f1a.zip | |
KVM: x86: #GP when attempts to write reserved bits of Variable Range MTRRs
Section 11.11.2.3 of the SDM mentions "All other bits in the IA32_MTRR_PHYSBASEn
and IA32_MTRR_PHYSMASKn registers are reserved; the processor generates a
general-protection exception(#GP) if software attempts to write to them". This
patch do it in kvm.
Signed-off-by: Wanpeng Li <wanpeng.li@linux.intel.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
| -rw-r--r-- | arch/x86/kvm/x86.c | 18 |
1 files changed, 15 insertions, 3 deletions
diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c index fb3ea7aad0c1..737b4bdac41c 100644 --- 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; } |