KVM: s390: fix guest fprs memory leak
authorDavid Hildenbrand <dahi@linux.vnet.ibm.com>
Fri, 22 Jan 2016 13:55:56 +0000 (14:55 +0100)
committerChristian Borntraeger <borntraeger@de.ibm.com>
Tue, 26 Jan 2016 14:40:09 +0000 (15:40 +0100)
fprs is never freed, therefore resulting in a memory leak if
kvm_vcpu_init() fails or the vcpu is destroyed.

Fixes: 9977e886cbbc ("s390/kernel: lazy restore fpu registers")
Cc: stable@vger.kernel.org # v4.3+
Reported-by: Eric Farman <farman@linux.vnet.ibm.com>
Signed-off-by: David Hildenbrand <dahi@linux.vnet.ibm.com>
Reviewed-by: Eric Farman <farman@linux.vnet.ibm.com>
Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com>
arch/s390/kvm/kvm-s390.c

index 835d60bedb545fa1873b6b37e57dffbec3bb9600..797dbc4e11c3a0cbe309d3a66f6b6325098385b4 100644 (file)
@@ -1244,6 +1244,7 @@ void kvm_arch_vcpu_destroy(struct kvm_vcpu *vcpu)
 
        if (vcpu->kvm->arch.use_cmma)
                kvm_s390_vcpu_unsetup_cmma(vcpu);
+       kfree(vcpu->arch.guest_fpregs.fprs);
        free_page((unsigned long)(vcpu->arch.sie_block));
 
        kvm_vcpu_uninit(vcpu);
@@ -1661,12 +1662,14 @@ struct kvm_vcpu *kvm_arch_vcpu_create(struct kvm *kvm,
 
        rc = kvm_vcpu_init(vcpu, kvm, id);
        if (rc)
-               goto out_free_sie_block;
+               goto out_free_fprs;
        VM_EVENT(kvm, 3, "create cpu %d at 0x%pK, sie block at 0x%pK", id, vcpu,
                 vcpu->arch.sie_block);
        trace_kvm_s390_create_vcpu(id, vcpu, vcpu->arch.sie_block);
 
        return vcpu;
+out_free_fprs:
+       kfree(vcpu->arch.guest_fpregs.fprs);
 out_free_sie_block:
        free_page((unsigned long)(vcpu->arch.sie_block));
 out_free_cpu: