Commit 385407a6 authored by Michal Luczaj's avatar Michal Luczaj Committed by Paolo Bonzini
Browse files

KVM: x86/xen: Fix memory leak in kvm_xen_write_hypercall_page() 



Release page irrespectively of kvm_vcpu_write_guest() return value.

Suggested-by: default avatarPaul Durrant <paul@xen.org>
Fixes: 23200b7a ("KVM: x86/xen: intercept xen hypercalls if enabled")
Signed-off-by: default avatarMichal Luczaj <mhal@rbox.co>
Message-Id: <20221220151454.712165-1-mhal@rbox.co>
Reviewed-by: default avatarPaul Durrant <paul@xen.org>
Signed-off-by: default avatarDavid Woodhouse <dwmw@amazon.co.uk>
Message-Id: <20221226120320.1125390-1-dwmw2@infradead.org>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 23e528d9

arch/x86/kvm/xen.c

+4 −3
Original line number Diff line number Diff line
@@ -1069,6 +1069,7 @@ int kvm_xen_write_hypercall_page(struct kvm_vcpu *vcpu, u64 data) 
		u8 blob_size = lm ? kvm->arch.xen_hvm_config.blob_size_64

				  : kvm->arch.xen_hvm_config.blob_size_32;

		u8 *page;

		int ret;



		if (page_num >= blob_size)

			return 1;
@@ -1079,11 +1080,11 @@ int kvm_xen_write_hypercall_page(struct kvm_vcpu *vcpu, u64 data) 
		if (IS_ERR(page))

			return PTR_ERR(page);



		if (kvm_vcpu_write_guest(vcpu, page_addr, page, PAGE_SIZE)) {

		ret = kvm_vcpu_write_guest(vcpu, page_addr, page, PAGE_SIZE);

		kfree(page);

		if (ret)

			return 1;

	}

	}

	return 0;

}