From 9980d174ded4648db4e87a7030575acf2bcfb6f1 Mon Sep 17 00:00:00 2001 From: Andy Whitcroft Date: Wed, 31 Jan 2018 15:38:15 +0000 Subject: [PATCH 025/104] Revert "x86/kvm: add MSR_IA32_SPEC_CTRL and MSR_IA32_PRED_CMD to kvm" CVE-2017-5753 (revert embargoed) CVE-2017-5715 (revert embargoed) This reverts commit 15eb187f47ee2be44d34313bc89cfb719d82cb21. Signed-off-by: Andy Whitcroft --- arch/x86/include/asm/kvm_host.h | 2 -- arch/x86/kvm/vmx.c | 10 ---------- arch/x86/kvm/x86.c | 2 +- 3 files changed, 1 insertion(+), 13 deletions(-) diff --git a/arch/x86/include/asm/kvm_host.h b/arch/x86/include/asm/kvm_host.h index 78ec3cda9429..92c9032502d8 100644 --- a/arch/x86/include/asm/kvm_host.h +++ b/arch/x86/include/asm/kvm_host.h @@ -628,8 +628,6 @@ struct kvm_vcpu_arch { u64 mcg_ext_ctl; u64 *mce_banks; - u64 spec_ctrl; - /* Cache MMIO info */ u64 mmio_gva; unsigned access; diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c index a81079461b2f..01e73b641439 100644 --- a/arch/x86/kvm/vmx.c +++ b/arch/x86/kvm/vmx.c @@ -50,7 +50,6 @@ #include #include #include -#include #include "trace.h" #include "pmu.h" @@ -3244,9 +3243,6 @@ static int vmx_get_msr(struct kvm_vcpu *vcpu, struct msr_data *msr_info) case MSR_IA32_TSC: msr_info->data = guest_read_tsc(vcpu); break; - case MSR_IA32_SPEC_CTRL: - msr_info->data = vcpu->arch.spec_ctrl; - break; case MSR_IA32_SYSENTER_CS: msr_info->data = vmcs_read32(GUEST_SYSENTER_CS); break; @@ -3351,9 +3347,6 @@ static int vmx_set_msr(struct kvm_vcpu *vcpu, struct msr_data *msr_info) case MSR_IA32_TSC: kvm_write_tsc(vcpu, msr_info); break; - case MSR_IA32_SPEC_CTRL: - vcpu->arch.spec_ctrl = msr_info->data; - break; case MSR_IA32_CR_PAT: if (vmcs_config.vmentry_ctrl & VM_ENTRY_LOAD_IA32_PAT) { if (!kvm_mtrr_valid(vcpu, MSR_IA32_CR_PAT, data)) @@ -6122,7 +6115,6 @@ static int handle_rdmsr(struct kvm_vcpu *vcpu) msr_info.index = ecx; msr_info.host_initiated = false; - if (vmx_get_msr(vcpu, &msr_info)) { trace_kvm_msr_read_ex(ecx); kvm_inject_gp(vcpu, 0); @@ -6675,8 +6667,6 @@ static __init int hardware_setup(void) vmx_disable_intercept_for_msr(MSR_IA32_SYSENTER_CS, false); vmx_disable_intercept_for_msr(MSR_IA32_SYSENTER_ESP, false); vmx_disable_intercept_for_msr(MSR_IA32_SYSENTER_EIP, false); - vmx_disable_intercept_for_msr(MSR_IA32_SPEC_CTRL, false); - vmx_disable_intercept_for_msr(MSR_IA32_PRED_CMD, false); memcpy(vmx_msr_bitmap_legacy_x2apic_apicv, vmx_msr_bitmap_legacy, PAGE_SIZE); diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c index f896c441fc2c..7351cdc46cc7 100644 --- a/arch/x86/kvm/x86.c +++ b/arch/x86/kvm/x86.c @@ -983,7 +983,7 @@ static u32 msrs_to_save[] = { MSR_CSTAR, MSR_KERNEL_GS_BASE, MSR_SYSCALL_MASK, MSR_LSTAR, #endif MSR_IA32_TSC, MSR_IA32_CR_PAT, MSR_VM_HSAVE_PA, - MSR_IA32_FEATURE_CONTROL, MSR_IA32_BNDCFGS, MSR_TSC_AUX, MSR_IA32_SPEC_CTRL, + MSR_IA32_FEATURE_CONTROL, MSR_IA32_BNDCFGS, MSR_TSC_AUX, }; static unsigned num_msrs_to_save; -- 2.15.1