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

Commit 91880d07 authored by Thomas Huth's avatar Thomas Huth Committed by Christian Borntraeger
Browse files

KVM: s390: Fix possible memory leak in SIGP functions 



When kvm_get_vcpu() returned NULL for the destination CPU in
__sigp_emergency() or __sigp_external_call(), the memory for the
"inti" structure was not released anymore. This patch fixes this
issue by moving the check for !dst_vcpu before the kzalloc() call.

Signed-off-by: default avatarThomas Huth <thuth@linux.vnet.ibm.com>
Reviewed-by: default avatarCornelia Huck <cornelia.huck@de.ibm.com>
Signed-off-by: default avatarChristian Borntraeger <borntraeger@de.ibm.com>
parent 609433fb

arch/s390/kvm/sigp.c

+6 −8
Original line number Original line Diff line number Diff line
@@ -58,7 +58,9 @@ static int __sigp_emergency(struct kvm_vcpu *vcpu, u16 cpu_addr) 
	struct kvm_s390_interrupt_info *inti;

	struct kvm_s390_interrupt_info *inti;

	struct kvm_vcpu *dst_vcpu = NULL;

	struct kvm_vcpu *dst_vcpu = NULL;





	if (cpu_addr >= KVM_MAX_VCPUS)

	if (cpu_addr < KVM_MAX_VCPUS)

		dst_vcpu = kvm_get_vcpu(vcpu->kvm, cpu_addr);

	if (!dst_vcpu)

		return SIGP_CC_NOT_OPERATIONAL;

		return SIGP_CC_NOT_OPERATIONAL;





	inti = kzalloc(sizeof(*inti), GFP_KERNEL);

	inti = kzalloc(sizeof(*inti), GFP_KERNEL);
@@ -68,9 +70,6 @@ static int __sigp_emergency(struct kvm_vcpu *vcpu, u16 cpu_addr) 
	inti->type = KVM_S390_INT_EMERGENCY;

	inti->type = KVM_S390_INT_EMERGENCY;

	inti->emerg.code = vcpu->vcpu_id;

	inti->emerg.code = vcpu->vcpu_id;





	dst_vcpu = kvm_get_vcpu(vcpu->kvm, cpu_addr);

	if (!dst_vcpu)

		return SIGP_CC_NOT_OPERATIONAL;

	li = &dst_vcpu->arch.local_int;

	li = &dst_vcpu->arch.local_int;

	spin_lock_bh(&li->lock);

	spin_lock_bh(&li->lock);

	list_add_tail(&inti->list, &li->list);

	list_add_tail(&inti->list, &li->list);
@@ -121,7 +120,9 @@ static int __sigp_external_call(struct kvm_vcpu *vcpu, u16 cpu_addr) 
	struct kvm_s390_interrupt_info *inti;

	struct kvm_s390_interrupt_info *inti;

	struct kvm_vcpu *dst_vcpu = NULL;

	struct kvm_vcpu *dst_vcpu = NULL;





	if (cpu_addr >= KVM_MAX_VCPUS)

	if (cpu_addr < KVM_MAX_VCPUS)

		dst_vcpu = kvm_get_vcpu(vcpu->kvm, cpu_addr);

	if (!dst_vcpu)

		return SIGP_CC_NOT_OPERATIONAL;

		return SIGP_CC_NOT_OPERATIONAL;





	inti = kzalloc(sizeof(*inti), GFP_KERNEL);

	inti = kzalloc(sizeof(*inti), GFP_KERNEL);
@@ -131,9 +132,6 @@ static int __sigp_external_call(struct kvm_vcpu *vcpu, u16 cpu_addr) 
	inti->type = KVM_S390_INT_EXTERNAL_CALL;

	inti->type = KVM_S390_INT_EXTERNAL_CALL;

	inti->extcall.code = vcpu->vcpu_id;

	inti->extcall.code = vcpu->vcpu_id;





	dst_vcpu = kvm_get_vcpu(vcpu->kvm, cpu_addr);

	if (!dst_vcpu)

		return SIGP_CC_NOT_OPERATIONAL;

	li = &dst_vcpu->arch.local_int;

	li = &dst_vcpu->arch.local_int;

	spin_lock_bh(&li->lock);

	spin_lock_bh(&li->lock);

	list_add_tail(&inti->list, &li->list);

	list_add_tail(&inti->list, &li->list);