Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm (e303a067) · Commits · 戴 / test

arch/x86/kvm/vmx/nested.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -211,6 +211,7 @@ static void free_nested(struct kvm_vcpu *vcpu)
		if (!vmx->nested.vmxon && !vmx->nested.smm.vmxon)
		return;

		hrtimer_cancel(&vmx->nested.preemption_timer);
		vmx->nested.vmxon = false;
		vmx->nested.smm.vmxon = false;
		free_vpid(vmx->nested.vpid02);

+7 −0

Original line number	Diff line number	Diff line
		@@ -5116,6 +5116,13 @@ int kvm_read_guest_virt(struct kvm_vcpu *vcpu,
		{
		u32 access = (kvm_x86_ops->get_cpl(vcpu) == 3) ? PFERR_USER_MASK : 0;

		/*
		* FIXME: this should call handle_emulation_failure if X86EMUL_IO_NEEDED
		* is returned, but our callers are not ready for that and they blindly
		* call kvm_inject_page_fault. Ensure that they at least do not leak
		* uninitialized kernel stack memory into cr2 and error code.
		*/
		memset(exception, 0, sizeof(*exception));
		return kvm_read_guest_virt_helper(addr, val, bytes, vcpu, access,
		exception);
		}

+2 −1

Original line number	Diff line number	Diff line
		@@ -3000,8 +3000,10 @@ static int kvm_ioctl_create_device(struct kvm *kvm,
		if (ops->init)
		ops->init(dev);

		kvm_get_kvm(kvm);
		ret = anon_inode_getfd(ops->name, &kvm_device_fops, dev, O_RDWR \| O_CLOEXEC);
		if (ret < 0) {
		kvm_put_kvm(kvm);
		mutex_lock(&kvm->lock);
		list_del(&dev->vm_node);
		mutex_unlock(&kvm->lock);
		@@ -3009,7 +3011,6 @@ static int kvm_ioctl_create_device(struct kvm *kvm,
		return ret;
		}

		kvm_get_kvm(kvm);
		cd->fd = ret;
		return 0;
		}