| Message ID | 1408355431-115633-4-git-send-email-wanpeng.li@linux.intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Il 18/08/2014 11:50, Wanpeng Li ha scritto: > + if (msr >= 0x200 && msr < 0x200 + 2 * KVM_NR_VAR_MTRR) { This should be a WARN_ON, and the base/mask can be separated just with an "&". 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; Please provide a unit test for this patch and for patch 1. Paolo > + int idx, is_mtrr_mask; > + > + idx = (msr - 0x200) / 2; > + is_mtrr_mask = msr - 0x200 - 2 * idx; > + if (!is_mtrr_mask) > + return valid_mtrr_type(data & 0xff); > + } > + return true; > } -- To unsubscribe from this list: send the line "unsubscribe kvm" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c index 204422d..30f55cc 100644 --- a/arch/x86/kvm/x86.c +++ b/arch/x86/kvm/x86.c @@ -1767,7 +1767,15 @@ static bool mtrr_valid(struct kvm_vcpu *vcpu, u32 msr, u64 data) } /* variable MTRRs */ - return valid_mtrr_type(data & 0xff); + if (msr >= 0x200 && msr < 0x200 + 2 * KVM_NR_VAR_MTRR) { + int idx, is_mtrr_mask; + + idx = (msr - 0x200) / 2; + is_mtrr_mask = msr - 0x200 - 2 * idx; + if (!is_mtrr_mask) + return valid_mtrr_type(data & 0xff); + } + return true; } static int set_msr_mtrr(struct kvm_vcpu *vcpu, u32 msr, u64 data)
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> --- arch/x86/kvm/x86.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-)