Commit fb3ff69d authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'kvm-updates/2.6.37' of git://git.kernel.org/pub/scm/virt/kvm/kvm 

* 'kvm-updates/2.6.37' of git://git.kernel.org/pub/scm/virt/kvm/kvm:
  KVM: VMX: Fix host userspace gsbase corruption
  KVM: Correct ordering of ldt reload wrt fs/gs reload
parents 2d42dc3f c8770e7b

arch/x86/kvm/svm.c

+1 −1
Original line number Diff line number Diff line
@@ -3395,6 +3395,7 @@ static void svm_vcpu_run(struct kvm_vcpu *vcpu) 
	vcpu->arch.regs[VCPU_REGS_RIP] = svm->vmcb->save.rip;



	load_host_msrs(vcpu);

	kvm_load_ldt(ldt_selector);

	loadsegment(fs, fs_selector);

#ifdef CONFIG_X86_64

	load_gs_index(gs_selector);
@@ -3402,7 +3403,6 @@ static void svm_vcpu_run(struct kvm_vcpu *vcpu) 
#else

	loadsegment(gs, gs_selector);

#endif

	kvm_load_ldt(ldt_selector);



	reload_tss(vcpu);

arch/x86/kvm/vmx.c

+9 −10
Original line number Diff line number Diff line
@@ -821,10 +821,9 @@ static void vmx_save_host_state(struct kvm_vcpu *vcpu) 
#endif



#ifdef CONFIG_X86_64

	if (is_long_mode(&vmx->vcpu)) {

	rdmsrl(MSR_KERNEL_GS_BASE, vmx->msr_host_kernel_gs_base);

	if (is_long_mode(&vmx->vcpu))

		wrmsrl(MSR_KERNEL_GS_BASE, vmx->msr_guest_kernel_gs_base);

	}

#endif

	for (i = 0; i < vmx->save_nmsrs; ++i)

		kvm_set_shared_msr(vmx->guest_msrs[i].index,
@@ -839,23 +838,23 @@ static void __vmx_load_host_state(struct vcpu_vmx *vmx) 


	++vmx->vcpu.stat.host_state_reload;

	vmx->host_state.loaded = 0;

	if (vmx->host_state.fs_reload_needed)

		loadsegment(fs, vmx->host_state.fs_sel);

#ifdef CONFIG_X86_64

	if (is_long_mode(&vmx->vcpu))

		rdmsrl(MSR_KERNEL_GS_BASE, vmx->msr_guest_kernel_gs_base);

#endif

	if (vmx->host_state.gs_ldt_reload_needed) {

		kvm_load_ldt(vmx->host_state.ldt_sel);

#ifdef CONFIG_X86_64

		load_gs_index(vmx->host_state.gs_sel);

		wrmsrl(MSR_KERNEL_GS_BASE, current->thread.gs);

#else

		loadsegment(gs, vmx->host_state.gs_sel);

#endif

	}

	if (vmx->host_state.fs_reload_needed)

		loadsegment(fs, vmx->host_state.fs_sel);

	reload_tss();

#ifdef CONFIG_X86_64

	if (is_long_mode(&vmx->vcpu)) {

		rdmsrl(MSR_KERNEL_GS_BASE, vmx->msr_guest_kernel_gs_base);

	wrmsrl(MSR_KERNEL_GS_BASE, vmx->msr_host_kernel_gs_base);

	}

#endif

	if (current_thread_info()->status & TS_USEDFPU)

		clts();