99885eadf2
xen-4.4.1-testing-src.tar.bz2 - Dropped patches now contained in tarball 53d7b781-x86-cpu-undo-BIOS-CPUID-max_leaf-limit-earlier.patch 53df71c7-lz4-check-for-underruns.patch 53e47d6b-x86_emulate-properly-do-IP-updates-and-other-side-effects.patch - bnc#882089 - Windows 2012 R2 fails to boot up with greater than 60 vcpus 53df727b-x86-HVM-extend-LAPIC-shortcuts-around-P2M-lookups.patch 53e8be5f-x86-vHPET-use-rwlock-instead-of-simple-one.patch 53ff3659-x86-consolidate-boolean-inputs-in-hvm-and-p2m.patch 53ff36ae-x86-hvm-treat-non-insn-fetch-NPF-also-as-read-violations.patch 53ff36d5-x86-mem_event-deliver-gla-fault-EPT-violation-information.patch 54005472-EPT-utilize-GLA-GPA-translation-known-for-certain-faults.patch - Upstream patches from Jan 53f737b1-VMX-fix-DebugCtl-MSR-clearing.patch 53f7386d-x86-irq-process-softirqs-in-irq-keyhandlers.patch 53ff3716-x86-ats-Disable-Address-Translation-Services-by-default.patch 53ff3899-x86-NMI-allow-processing-unknown-NMIs-with-watchdog.patch - bnc#864801 - VUL-0: CVE-2013-4540: qemu: zaurus: buffer overrun on invalid state load CVE-2013-4540-qemu.patch OBS-URL: https://build.opensuse.org/package/show/Virtualization/xen?expand=0&rev=328
40 lines
1.3 KiB
Diff
40 lines
1.3 KiB
Diff
# Commit dfa625e15f3d6c374637f2bb789e1f444c2781c3
|
|
# Date 2014-08-22 14:29:37 +0200
|
|
# Author Jan Beulich <jbeulich@suse.com>
|
|
# Committer Jan Beulich <jbeulich@suse.com>
|
|
VMX: fix DebugCtl MSR clearing
|
|
|
|
The previous shortcut was wrong, as it bypassed the necessary vmwrite:
|
|
All we really want to avoid if the guest writes zero is to add the MSR
|
|
to the host-load list.
|
|
|
|
Signed-off-by: Jan Beulich <jbeulich@suse.com>
|
|
Reviewed-by: Andrew Cooper <andrew.cooper3@citrix.com>
|
|
Acked-by: Kevin Tian <kevin.tian@intel.com>
|
|
|
|
--- a/xen/arch/x86/hvm/vmx/vmx.c
|
|
+++ b/xen/arch/x86/hvm/vmx/vmx.c
|
|
@@ -2170,8 +2170,6 @@ static int vmx_msr_write_intercept(unsig
|
|
int i, rc = 0;
|
|
uint64_t supported = IA32_DEBUGCTLMSR_LBR | IA32_DEBUGCTLMSR_BTF;
|
|
|
|
- if ( !msr_content )
|
|
- break;
|
|
if ( msr_content & ~supported )
|
|
{
|
|
/* Perhaps some other bits are supported in vpmu. */
|
|
@@ -2191,12 +2189,10 @@ static int vmx_msr_write_intercept(unsig
|
|
}
|
|
|
|
if ( (rc < 0) ||
|
|
- (vmx_add_host_load_msr(msr) < 0) )
|
|
+ (msr_content && (vmx_add_host_load_msr(msr) < 0)) )
|
|
hvm_inject_hw_exception(TRAP_machine_check, 0);
|
|
else
|
|
- {
|
|
__vmwrite(GUEST_IA32_DEBUGCTL, msr_content);
|
|
- }
|
|
|
|
break;
|
|
}
|