Commit 78658137 authored by Junaid Shahid's avatar Junaid Shahid Committed by Yu Zhang
Browse files

kvm: x86: Do proper cleanup if kvm_x86_ops->vm_init() fails 

mainline inclusion
from mainline-v6.1-rc1
commit b24ede22
category: feature
bugzilla: https://gitee.com/openeuler/intel-kernel/issues/I9HH9U
CVE: N/A
Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=b24ede22538b4d984cbe20532bbcb303692e7f52



-------------------------------------

If vm_init() fails [which can happen, for instance, if a memory
allocation fails during avic_vm_init()], we need to cleanup some
state in order to avoid resource leaks.

Signed-off-by: default avatarJunaid Shahid <junaids@google.com>
Link: https://lore.kernel.org/r/20220729224329.323378-1-junaids@google.com


Signed-off-by: default avatarSean Christopherson <seanjc@google.com>

Conflicts:
	arch/x86/kvm/x86.c
Signed-off-by: default avatarYu Zhang <yu.c.zhang@linux.intel.com>
parent d4329543

arch/x86/kvm/x86.c

+7 −1
Original line number Diff line number Diff line
@@ -11033,6 +11033,10 @@ int kvm_arch_init_vm(struct kvm *kvm, unsigned long type) 
	if (ret)

		goto out_page_track;



	ret =  kvm_x86_ops.vm_init(kvm);

	if (ret)

		goto out_uninit_mmu;



	INIT_HLIST_HEAD(&kvm->arch.mask_notifier_list);

	INIT_LIST_HEAD(&kvm->arch.assigned_dev_head);

	atomic_set(&kvm->arch.noncoherent_dma_count, 0);
@@ -11057,8 +11061,10 @@ int kvm_arch_init_vm(struct kvm *kvm, unsigned long type) 


	kvm_hv_init_vm(kvm);



	return kvm_x86_ops.vm_init(kvm);

	return 0;



out_uninit_mmu:

	kvm_mmu_uninit_vm(kvm);

out_page_track:

	kvm_page_track_cleanup(kvm);

out: