1 files changed, 9 insertions, 1 deletions

diff --git a/arch/powerpc/kvm/booke.c b/arch/powerpc/kvm/booke.c
index ee45fa01220e..bb6c988f010a 100644
--- a/arch/powerpc/kvm/booke.c
+++ b/arch/powerpc/kvm/booke.c
@@ -316,6 +316,11 @@ int kvmppc_vcpu_run(struct kvm_run *kvm_run, struct kvm_vcpu *vcpu)
 {
         int ret;
 
+        if (!vcpu->arch.sane) {
+                kvm_run->exit_reason = KVM_EXIT_INTERNAL_ERROR;
+                return -EINVAL;
+        }
+
         local_irq_disable();
         kvm_guest_enter();
         ret = __kvmppc_vcpu_run(kvm_run, vcpu);
@@ -618,6 +623,7 @@ int kvmppc_handle_exit(struct kvm_run *run, struct kvm_vcpu *vcpu,
 int kvm_arch_vcpu_setup(struct kvm_vcpu *vcpu)
 {
         int i;
+        int r;
 
         vcpu->arch.pc = 0;
         vcpu->arch.shared->msr = 0;
@@ -634,7 +640,9 @@ int kvm_arch_vcpu_setup(struct kvm_vcpu *vcpu)
 
         kvmppc_init_timing_stats(vcpu);
 
-        return kvmppc_core_vcpu_setup(vcpu);
+        r = kvmppc_core_vcpu_setup(vcpu);
+        kvmppc_sanity_check(vcpu);
+        return r;
 }
 
 int kvm_arch_vcpu_ioctl_get_regs(struct kvm_vcpu *vcpu, struct kvm_regs *regs)