summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorDavid Hildenbrand <dahi@linux.vnet.ibm.com>2015-01-15 17:56:18 +0100
committerLuis Henriques <luis.henriques@canonical.com>2015-03-02 13:17:09 +0000
commitf823f3b36e1c9d39a202ae6f7785f22498858ee1 (patch)
tree29feb1f3145fa60bf73951e9598bef7604f6e8fe /arch
parent3be0cd3f8b4355624024ca26cfafa51c83f48ea4 (diff)
downloadlinux-stable-f823f3b36e1c9d39a202ae6f7785f22498858ee1.tar.gz
linux-stable-f823f3b36e1c9d39a202ae6f7785f22498858ee1.tar.bz2
linux-stable-f823f3b36e1c9d39a202ae6f7785f22498858ee1.zip
KVM: s390: floating irqs: fix user triggerable endless loop
commit 8e2207cdd087ebb031e9118d1fd0902c6533a5e5 upstream. If a vm with no VCPUs is created, the injection of a floating irq leads to an endless loop in the kernel. Let's skip the search for a destination VCPU for a floating irq if no VCPUs were created. Reviewed-by: Dominik Dingel <dingel@linux.vnet.ibm.com> Reviewed-by: Cornelia Huck <cornelia.huck@de.ibm.com> Signed-off-by: David Hildenbrand <dahi@linux.vnet.ibm.com> Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com> Signed-off-by: Luis Henriques <luis.henriques@canonical.com>
Diffstat (limited to 'arch')
-rw-r--r--arch/s390/kvm/interrupt.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/s390/kvm/interrupt.c b/arch/s390/kvm/interrupt.c
index e2354f97264e..f19702fc89ec 100644
--- a/arch/s390/kvm/interrupt.c
+++ b/arch/s390/kvm/interrupt.c
@@ -925,6 +925,8 @@ static int __inject_vm(struct kvm *kvm, struct kvm_s390_interrupt_info *inti)
list_add_tail(&inti->list, &iter->list);
}
atomic_set(&fi->active, 1);
+ if (atomic_read(&kvm->online_vcpus) == 0)
+ goto unlock_fi;
sigcpu = find_first_bit(fi->idle_mask, KVM_MAX_VCPUS);
if (sigcpu == KVM_MAX_VCPUS) {
do {