Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b7af4043 authored by Takuya Yoshikawa's avatar Takuya Yoshikawa Committed by Avi Kivity
Browse files

KVM: SVM: Fix memory leaks that happen when svm_create_vcpu() fails 



svm_create_vcpu() does not free the pages allocated during the creation
when it fails to complete the allocations. This patch fixes it.

Signed-off-by: default avatarTakuya Yoshikawa <yoshikawa.takuya@oss.ntt.co.jp>
Signed-off-by: default avatarAvi Kivity <avi@redhat.com>
parent 7567cae1

arch/x86/kvm/svm.c

+15 −10
Original line number Diff line number Diff line
@@ -706,29 +706,28 @@ static struct kvm_vcpu *svm_create_vcpu(struct kvm *kvm, unsigned int id) 
	if (err)

		goto free_svm;



	page = alloc_page(GFP_KERNEL);

	if (!page) {

	err = -ENOMEM;

	page = alloc_page(GFP_KERNEL);

	if (!page)

		goto uninit;

	}



	err = -ENOMEM;

	msrpm_pages = alloc_pages(GFP_KERNEL, MSRPM_ALLOC_ORDER);

	if (!msrpm_pages)

		goto uninit;

		goto free_page1;



	nested_msrpm_pages = alloc_pages(GFP_KERNEL, MSRPM_ALLOC_ORDER);

	if (!nested_msrpm_pages)

		goto uninit;



	svm->msrpm = page_address(msrpm_pages);

	svm_vcpu_init_msrpm(svm->msrpm);

		goto free_page2;



	hsave_page = alloc_page(GFP_KERNEL);

	if (!hsave_page)

		goto uninit;

		goto free_page3;



	svm->nested.hsave = page_address(hsave_page);



	svm->msrpm = page_address(msrpm_pages);

	svm_vcpu_init_msrpm(svm->msrpm);



	svm->nested.msrpm = page_address(nested_msrpm_pages);



	svm->vmcb = page_address(page);
@@ -744,6 +743,12 @@ static struct kvm_vcpu *svm_create_vcpu(struct kvm *kvm, unsigned int id) 


	return &svm->vcpu;



free_page3:

	__free_pages(nested_msrpm_pages, MSRPM_ALLOC_ORDER);

free_page2:

	__free_pages(msrpm_pages, MSRPM_ALLOC_ORDER);

free_page1:

	__free_page(page);

uninit:

	kvm_vcpu_uninit(&svm->vcpu);

free_svm: