Merge branch 'kvm-null-pointer-fix' into HEAD (0c546725) · Commits · 戴 / test

arch/x86/kvm/vmx/nested.c

+3 −2

Original line number	Diff line number	Diff line
		@@ -224,7 +224,7 @@ static inline void nested_release_evmcs(struct kvm_vcpu *vcpu)
		return;

		kvm_vcpu_unmap(vcpu, &vmx->nested.hv_evmcs_map, true);
		vmx->nested.hv_evmcs_vmptr = -1ull;
		vmx->nested.hv_evmcs_vmptr = 0;
		vmx->nested.hv_evmcs = NULL;
		}

		@@ -1922,7 +1922,8 @@ static int nested_vmx_handle_enlightened_vmptrld(struct kvm_vcpu *vcpu,
		if (!nested_enlightened_vmentry(vcpu, &evmcs_gpa))
		return 1;

		if (unlikely(evmcs_gpa != vmx->nested.hv_evmcs_vmptr)) {
		if (unlikely(!vmx->nested.hv_evmcs \|\|
		evmcs_gpa != vmx->nested.hv_evmcs_vmptr)) {
		if (!vmx->nested.hv_evmcs)
		vmx->nested.current_vmptr = -1ull;