KVM: x86/xen: Fix memory leak in kvm_xen_write_hypercall_page()
Subsystems (4)
PATCH v2 1/1 KVM: x86/xen: Fix memory leak in kvm_xen_write_hypercall_page()
Release page irrespectively of kvm_vcpu_write_guest() return value.
Suggested-by Paul Durrant <[email protected]>
Fixes 23200b7a30de ("KVM: x86/xen: intercept xen hypercalls if enabled")
Signed-off-by Michal Luczaj <[email protected]>
--- arch/x86/kvm/xen.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
arch/x86/kvm/xen.c +4 -3
@@ -889,6 +889,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 ;
@@ -899,10 +900,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 ; }
Signature · 1 line
2.39.0
Quoted 25 lines · Michal Luczaj
Release page irrespectively of
kvm_vcpu_write_guest()return value.Suggested-by Paul Durrant <[email protected]>Fixes 23200b7a30de ("KVM: x86/xen: intercept xen hypercalls if enabled")Signed-off-by Michal Luczaj <[email protected]>--- arch/x86/kvm/xen.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)arch/x86/kvm/xen.c +1
-0@@ -889,6 +889,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 ;@@ -899,10 +900,10 @@ int kvm_xen_write_hypercall_page(struct kvm_vcpu *vcpu, u64 data)if (IS_ERR (page))return PTR_ERR (page);
arch/x86/kvm/xen.c int kvm_xen_write_hypercall_page(struct kvm_vcpu *vcpu, u64 data) · line 909
Quoted 10 lines
arch/x86/kvm/xen.c +3
-3-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 ; }
Thanks.
Reviewed-by Paul Durrant <[email protected]>