diff options
author | Carsten Otte <cotte@de.ibm.com> | 2009-05-12 11:21:53 -0400 |
---|---|---|
committer | Avi Kivity <avi@redhat.com> | 2009-06-10 04:48:57 -0400 |
commit | 51e4d5ab28c75d819b3840da11559ad5c1429135 (patch) | |
tree | e4d706b1efa810e60354b8e8d6dc10179df4bbba /arch/s390 | |
parent | 3edbcff9bfe2ed632e518b3cfe807d062cee8269 (diff) |
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')
-rw-r--r-- | arch/s390/kvm/kvm-s390.c | 6 |
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) | |||
487 | 487 | ||
488 | vcpu_load(vcpu); | 488 | vcpu_load(vcpu); |
489 | 489 | ||
490 | /* verify, that memory has been registered */ | ||
491 | if (!vcpu->kvm->arch.guest_memsize) { | ||
492 | vcpu_put(vcpu); | ||
493 | return -EINVAL; | ||
494 | } | ||
495 | |||
490 | if (vcpu->sigset_active) | 496 | if (vcpu->sigset_active) |
491 | sigprocmask(SIG_SETMASK, &vcpu->sigset, &sigsaved); | 497 | sigprocmask(SIG_SETMASK, &vcpu->sigset, &sigsaved); |
492 | 498 | ||