From d15545f578671a26254b7778812c6911c6025d9c Mon Sep 17 00:00:00 2001 From: Andy Whitcroft Date: Tue, 20 Feb 2018 13:53:43 +0000 Subject: [PATCH 023/131] Revert "UBUNTU: SAUCE: 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 764acfeffb96a6b928f2143bcde4e48815e2cbc7. Signed-off-by: Andy Whitcroft --- arch/x86/include/asm/kvm_host.h | 2 -- arch/x86/kvm/vmx.c | 9 --------- arch/x86/kvm/x86.c | 2 +- 3 files changed, 1 insertion(+), 12 deletions(-) diff --git a/arch/x86/include/asm/kvm_host.h b/arch/x86/include/asm/kvm_host.h index 329edca60a27..70427d1182b2 100644 --- a/arch/x86/include/asm/kvm_host.h +++ b/arch/x86/include/asm/kvm_host.h @@ -477,8 +477,6 @@ struct kvm_vcpu_arch { u64 mcg_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 d07794b49502..4ae0fb380448 100644 --- a/arch/x86/kvm/vmx.c +++ b/arch/x86/kvm/vmx.c @@ -43,7 +43,6 @@ #include #include #include -#include #include "trace.h" @@ -2468,9 +2467,6 @@ static int vmx_get_msr(struct kvm_vcpu *vcpu, u32 msr_index, u64 *pdata) case MSR_IA32_TSC: data = guest_read_tsc(); break; - case MSR_IA32_SPEC_CTRL: - data = vcpu->arch.spec_ctrl; - break; case MSR_IA32_SYSENTER_CS: data = vmcs_read32(GUEST_SYSENTER_CS); break; @@ -2542,9 +2538,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 = data; - break; case MSR_IA32_CR_PAT: if (vmcs_config.vmentry_ctrl & VM_ENTRY_LOAD_IA32_PAT) { vmcs_write64(GUEST_IA32_PAT, data); @@ -8735,8 +8728,6 @@ static int __init vmx_init(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, vmx_msr_bitmap_legacy, PAGE_SIZE); memcpy(vmx_msr_bitmap_longmode_x2apic, diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c index 770ace4e1379..5eb469084082 100644 --- a/arch/x86/kvm/x86.c +++ b/arch/x86/kvm/x86.c @@ -859,7 +859,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_SPEC_CTRL + MSR_IA32_FEATURE_CONTROL }; static unsigned num_msrs_to_save; -- 2.15.1