UBUNTU: SAUCE: (no-up) Fix up KVM: VMX: Fix host userspace gsbase corruption
 

BugLink: http://bugs.launchpad.net/bugs/787675

The backport for the following commit was incorrect, eg. it removed a
line which it shouldn't have.

commit 6cbdc7ba48dff850c233a1ea1abe87a6d0cde2dd
Author: Avi Kivity <avi@redhat.com>
Date: Thu Nov 11 12:37:26 2010 +0200

KVM: VMX: Fix host userspace gsbase corruption

Fix up the backport to be correct.

Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
---
arch/x86/kvm/vmx.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c
index 77c3287..e3222ab 100644
--- a/arch/x86/kvm/vmx.c
+++ b/arch/x86/kvm/vmx.c
@@ -699,7 +699,7 @@ static void __vmx_load_host_state(struct vcpu_vmx *vmx)
if (vmx->host_state.gs_ldt_reload_needed) {
kvm_load_ldt(vmx->host_state.ldt_sel);
#ifdef CONFIG_X86_64
- wrmsrl(MSR_KERNEL_GS_BASE, current->thread.gs);
+ load_gs_index(vmx->host_state.gs_sel);
#else
loadsegment(gs, vmx->host_state.gs_sel);
#endif
--
1.7.0.4




--
kernel-team mailing list
kernel-team@lists.ubuntu.com
https://lists.ubuntu.com/mailman/listinfo/kernel-team