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

Commit 9c7ebb61 authored by David Hildenbrand's avatar David Hildenbrand Committed by Christian Borntraeger
Browse files

KVM: s390: fix guest fprs memory leak 



fprs is never freed, therefore resulting in a memory leak if
kvm_vcpu_init() fails or the vcpu is destroyed.

Fixes: 9977e886 ("s390/kernel: lazy restore fpu registers")
Cc: stable@vger.kernel.org # v4.3+
Reported-by: default avatarEric Farman <farman@linux.vnet.ibm.com>
Signed-off-by: default avatarDavid Hildenbrand <dahi@linux.vnet.ibm.com>
Reviewed-by: default avatarEric Farman <farman@linux.vnet.ibm.com>
Signed-off-by: default avatarChristian Borntraeger <borntraeger@de.ibm.com>
parent 7d1fc01a

arch/s390/kvm/kvm-s390.c

+4 −1
Original line number Diff line number Diff line
@@ -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: