Re: [PATCH 1/6] KVM: x86/xen: Fix memory leak in kvm_xen_write_hypercall_page()

[Paolo Bonzini <pbonzini@xxxxxxxxxx>]

On 12/26/22 13:03, David Woodhouse wrote:
> From: Michal Luczaj <mhal@xxxxxxx>
>
> Release page irrespectively of kvm_vcpu_write_guest() return value.
>
> Suggested-by: Paul Durrant <paul@xxxxxxx>
> Fixes: 23200b7a30de ("KVM: x86/xen: intercept xen hypercalls if enabled")
> Signed-off-by: Michal Luczaj <mhal@xxxxxxx>
> Message-Id: <20221220151454.712165-1-mhal@xxxxxxx>
> Reviewed-by: Paul Durrant <paul@xxxxxxx>
> Signed-off-by: David Woodhouse <dwmw@xxxxxxxxxxxx>
> ---
>   arch/x86/kvm/xen.c | 7 ++++---
>   1 file changed, 4 insertions(+), 3 deletions(-)
>
> diff --git a/arch/x86/kvm/xen.c b/arch/x86/kvm/xen.c
> index d7af40240248..d1a98d834d18 100644
> --- a/arch/x86/kvm/xen.c
> +++ b/arch/x86/kvm/xen.c
> @@ -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,10 +1080,10 @@ 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)) {
> -			kfree(page);
> +		ret = kvm_vcpu_write_guest(vcpu, page_addr, page, PAGE_SIZE);
> +		kfree(page);
> +		if (ret)
>   			return 1;
> -		}
>   	}
>   	return 0;
>   }

Queued, thanks.

Paolo