Explorar o código

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

* 'kvm-updates/2.6.38' of git://git.kernel.org/pub/scm/virt/kvm/kvm:
  KVM: SVM: Make sure KERNEL_GS_BASE is valid when loading gs_index
Linus Torvalds %!s(int64=14) %!d(string=hai) anos
pai
achega
3c6c0d6ca3
Modificáronse 1 ficheiros con 1 adicións e 1 borrados
  1. 1 1
      arch/x86/kvm/svm.c

+ 1 - 1
arch/x86/kvm/svm.c

@@ -1150,8 +1150,8 @@ static void svm_vcpu_put(struct kvm_vcpu *vcpu)
 	kvm_load_ldt(svm->host.ldt);
 	kvm_load_ldt(svm->host.ldt);
 #ifdef CONFIG_X86_64
 #ifdef CONFIG_X86_64
 	loadsegment(fs, svm->host.fs);
 	loadsegment(fs, svm->host.fs);
-	load_gs_index(svm->host.gs);
 	wrmsrl(MSR_KERNEL_GS_BASE, current->thread.gs);
 	wrmsrl(MSR_KERNEL_GS_BASE, current->thread.gs);
+	load_gs_index(svm->host.gs);
 #else
 #else
 	loadsegment(gs, svm->host.gs);
 	loadsegment(gs, svm->host.gs);
 #endif
 #endif