Commit ac0d4eae authored by Andy Whitcroft's avatar Andy Whitcroft Committed by Kleber Sacilotto de Souza

Revert "x86/kvm: Set IBPB when switching VM"

CVE-2017-5753 (revert embargoed)
CVE-2017-5715 (revert embargoed)

This reverts commit 30907f82.
Signed-off-by: default avatarAndy Whitcroft <apw@canonical.com>
Signed-off-by: default avatarKleber Sacilotto de Souza <kleber.souza@canonical.com>
parent ceea78e2
...@@ -1336,7 +1336,6 @@ static void vmcs_load(struct vmcs *vmcs) ...@@ -1336,7 +1336,6 @@ static void vmcs_load(struct vmcs *vmcs)
if (error) if (error)
printk(KERN_ERR "kvm: vmptrld %p/%llx failed\n", printk(KERN_ERR "kvm: vmptrld %p/%llx failed\n",
vmcs, phys_addr); vmcs, phys_addr);
} }
#ifdef CONFIG_KEXEC_CORE #ifdef CONFIG_KEXEC_CORE
...@@ -2050,8 +2049,6 @@ static void vmx_vcpu_load(struct kvm_vcpu *vcpu, int cpu) ...@@ -2050,8 +2049,6 @@ static void vmx_vcpu_load(struct kvm_vcpu *vcpu, int cpu)
if (per_cpu(current_vmcs, cpu) != vmx->loaded_vmcs->vmcs) { if (per_cpu(current_vmcs, cpu) != vmx->loaded_vmcs->vmcs) {
per_cpu(current_vmcs, cpu) = vmx->loaded_vmcs->vmcs; per_cpu(current_vmcs, cpu) = vmx->loaded_vmcs->vmcs;
vmcs_load(vmx->loaded_vmcs->vmcs); vmcs_load(vmx->loaded_vmcs->vmcs);
if (boot_cpu_has(X86_FEATURE_SPEC_CTRL))
native_wrmsrl(MSR_IA32_PRED_CMD, FEATURE_SET_IBPB);
} }
if (vmx->loaded_vmcs->cpu != cpu) { if (vmx->loaded_vmcs->cpu != cpu) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment