summaryrefslogtreecommitdiffstats
path: root/arch/s390/kvm
diff options
context:
space:
mode:
authorCarsten Otte <cotte@de.ibm.com>2009-05-12 17:21:53 +0200
committerAvi Kivity <avi@redhat.com>2009-06-10 11:48:57 +0300
commit51e4d5ab28c75d819b3840da11559ad5c1429135 (patch)
treee4d706b1efa810e60354b8e8d6dc10179df4bbba /arch/s390/kvm
parent3edbcff9bfe2ed632e518b3cfe807d062cee8269 (diff)
downloadlinux-51e4d5ab28c75d819b3840da11559ad5c1429135.tar.gz
linux-51e4d5ab28c75d819b3840da11559ad5c1429135.tar.bz2
linux-51e4d5ab28c75d819b3840da11559ad5c1429135.zip
KVM: s390: Verify memory in kvm run
This check verifies that the guest we're trying to run in KVM_RUN has some memory assigned to it. It enters an endless exception loop if this is not the case. Reported-by: Mijo Safradin <mijo@linux.vnet.ibm.com> Signed-off-by: Carsten Otte <cotte@de.ibm.com> Signed-off-by: Christian Ehrhardt <ehrhardt@de.ibm.com> Signed-off-by: Avi Kivity <avi@redhat.com>
Diffstat (limited to 'arch/s390/kvm')
-rw-r--r--arch/s390/kvm/kvm-s390.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/arch/s390/kvm/kvm-s390.c b/arch/s390/kvm/kvm-s390.c
index 628494a43425..10bccd1f8aee 100644
--- a/arch/s390/kvm/kvm-s390.c
+++ b/arch/s390/kvm/kvm-s390.c
@@ -487,6 +487,12 @@ int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run)
vcpu_load(vcpu);
+ /* verify, that memory has been registered */
+ if (!vcpu->kvm->arch.guest_memsize) {
+ vcpu_put(vcpu);
+ return -EINVAL;
+ }
+
if (vcpu->sigset_active)
sigprocmask(SIG_SETMASK, &vcpu->sigset, &sigsaved);