Commit 0b5b1f9a authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm 

Pull KVM fixes from Paolo Bonzini:
 "Two vmx bugfixes"

* tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm:
  kvm: x86: vmx: fix vpid leak
  KVM: vmx: use local variable for current_vmptr when emulating VMPTRST
parents f6229c39 63aff655

arch/x86/kvm/vmx.c

+10 −12
Original line number Diff line number Diff line
@@ -7893,6 +7893,8 @@ static int enter_vmx_operation(struct kvm_vcpu *vcpu) 
		     HRTIMER_MODE_REL_PINNED);

	vmx->nested.preemption_timer.function = vmx_preemption_timer_fn;



	vmx->nested.vpid02 = allocate_vpid();



	vmx->nested.vmxon = true;

	return 0;
@@ -8480,21 +8482,20 @@ static int handle_vmptrld(struct kvm_vcpu *vcpu) 
/* Emulate the VMPTRST instruction */

static int handle_vmptrst(struct kvm_vcpu *vcpu)

{

	unsigned long exit_qualification = vmcs_readl(EXIT_QUALIFICATION);

	u32 vmx_instruction_info = vmcs_read32(VMX_INSTRUCTION_INFO);

	gva_t vmcs_gva;

	unsigned long exit_qual = vmcs_readl(EXIT_QUALIFICATION);

	u32 instr_info = vmcs_read32(VMX_INSTRUCTION_INFO);

	gpa_t current_vmptr = to_vmx(vcpu)->nested.current_vmptr;

	struct x86_exception e;

	gva_t gva;



	if (!nested_vmx_check_permission(vcpu))

		return 1;



	if (get_vmx_mem_address(vcpu, exit_qualification,

			vmx_instruction_info, true, &vmcs_gva))

	if (get_vmx_mem_address(vcpu, exit_qual, instr_info, true, &gva))

		return 1;

	/* *_system ok, nested_vmx_check_permission has verified cpl=0 */

	if (kvm_write_guest_virt_system(vcpu, vmcs_gva,

					(void *)&to_vmx(vcpu)->nested.current_vmptr,

					sizeof(u64), &e)) {

	if (kvm_write_guest_virt_system(vcpu, gva, (void *)&current_vmptr,

					sizeof(gpa_t), &e)) {

		kvm_inject_page_fault(vcpu, &e);

		return 1;

	}
@@ -10370,11 +10371,9 @@ static struct kvm_vcpu *vmx_create_vcpu(struct kvm *kvm, unsigned int id) 
			goto free_vmcs;

	}



	if (nested) {

	if (nested)

		nested_vmx_setup_ctls_msrs(&vmx->nested.msrs,

					   kvm_vcpu_apicv_active(&vmx->vcpu));

		vmx->nested.vpid02 = allocate_vpid();

	}



	vmx->nested.posted_intr_nv = -1;

	vmx->nested.current_vmptr = -1ull;
@@ -10391,7 +10390,6 @@ static struct kvm_vcpu *vmx_create_vcpu(struct kvm *kvm, unsigned int id) 
	return &vmx->vcpu;



free_vmcs:

	free_vpid(vmx->nested.vpid02);

	free_loaded_vmcs(vmx->loaded_vmcs);

free_msrs:

	kfree(vmx->guest_msrs);