Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0a77fe4c authored by Avi Kivity's avatar Avi Kivity Committed by Marcelo Tosatti
Browse files

KVM: Correct ordering of ldt reload wrt fs/gs reload 



If fs or gs refer to the ldt, they must be reloaded after the ldt.  Reorder
the code to that effect.

Userspace code that uses the ldt with kvm is nonexistent, so this doesn't fix
a user-visible bug.

Signed-off-by: default avatarAvi Kivity <avi@redhat.com>
Signed-off-by: default avatarMarcelo Tosatti <mtosatti@redhat.com>
parent 59365d13

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

+2 −2
Original line number Diff line number Diff line
@@ -839,8 +839,6 @@ 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);

	if (vmx->host_state.gs_ldt_reload_needed) {

		kvm_load_ldt(vmx->host_state.ldt_sel);

#ifdef CONFIG_X86_64
@@ -850,6 +848,8 @@ static void __vmx_load_host_state(struct vcpu_vmx *vmx) 
		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)) {