mirror of
https://github.com/xen-project/xen.git
synced 2026-10-28 10:11:27 +01:00
x86/HVM: properly bound x2APIC MSR range
While the write path change appears to be purely cosmetic (but still gets done here for consistency), the read side mistake permitted accesses beyond the virtual APIC page. Note that while this isn't fully in line with the specification (digesting MSRs 0x800-0xBFF for the x2APIC), this is the minimal possible fix addressing the security issue and getting x2APIC related code into a consistent shape (elsewhere a 256 rather than 1024 wide window is being used too). This will be dealt with subsequently. This is CVE-2014-7188 / XSA-108. Signed-off-by: Jan Beulich <jbeulich@suse.com>
This commit is contained in:
1 parent
b6e6ccfaa9
commit
61fdda7acf
1 file changed
+2
-2
@@ -4355,7 +4355,7 @@ int hvm_msr_read_intercept(unsigned int msr, uint64_t *msr_content)
|
||||
*msr_content = vcpu_vlapic(v)->hw.apic_base_msr;
|
||||
break;
|
||||
|
||||
case MSR_IA32_APICBASE_MSR ... MSR_IA32_APICBASE_MSR + 0x3ff:
|
||||
case MSR_IA32_APICBASE_MSR ... MSR_IA32_APICBASE_MSR + 0xff:
|
||||
if ( hvm_x2apic_msr_read(v, msr, msr_content) )
|
||||
goto gp_fault;
|
||||
break;
|
||||
@@ -4482,7 +4482,7 @@ int hvm_msr_write_intercept(unsigned int msr, uint64_t msr_content)
|
||||
vlapic_tdt_msr_set(vcpu_vlapic(v), msr_content);
|
||||
break;
|
||||
|
||||
case MSR_IA32_APICBASE_MSR ... MSR_IA32_APICBASE_MSR + 0x3ff:
|
||||
case MSR_IA32_APICBASE_MSR ... MSR_IA32_APICBASE_MSR + 0xff:
|
||||
if ( hvm_x2apic_msr_write(v, msr, msr_content) )
|
||||
goto gp_fault;
|
||||
break;
|
||||
|
||||