diff options
| author | Marcelo Tosatti <mtosatti@redhat.com> | 2009-09-28 15:05:53 -0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2009-10-05 08:27:58 -0700 |
| commit | bae0a76b07447df091f5906fd7c6678cbed9f7d9 (patch) | |
| tree | 97cde13d8140197a53dea3156da01b6539f99d74 | |
| parent | ae0661773f59370f84fb3d40897c2fc399d66442 (diff) | |
| download | linux-stable-bae0a76b07447df091f5906fd7c6678cbed9f7d9.tar.gz linux-stable-bae0a76b07447df091f5906fd7c6678cbed9f7d9.tar.bz2 linux-stable-bae0a76b07447df091f5906fd7c6678cbed9f7d9.zip | |
Revert "KVM: x86: check for cr3 validity in ioctl_set_sregs"
(cherry picked from commit dc7e795e3dd2a763e5ceaa1615f307e808cf3932)
This reverts commit 6c20e1442bb1c62914bb85b7f4a38973d2a423ba.
To my understanding, it became obsolete with the advent of the more
robust check in mmu_alloc_roots (89da4ff17f). Moreover, it prevents
the conceptually safe pattern
1. set sregs
2. register mem-slots
3. run vcpu
by setting a sticky triple fault during step 1.
Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
Signed-off-by: Avi Kivity <avi@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| -rw-r--r-- | arch/x86/kvm/x86.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c index 8fdcec02e1df..ec56c78bead7 100644 --- a/arch/x86/kvm/x86.c +++ b/arch/x86/kvm/x86.c @@ -4012,13 +4012,7 @@ int kvm_arch_vcpu_ioctl_set_sregs(struct kvm_vcpu *vcpu, vcpu->arch.cr2 = sregs->cr2; mmu_reset_needed |= vcpu->arch.cr3 != sregs->cr3; - - down_read(&vcpu->kvm->slots_lock); - if (gfn_to_memslot(vcpu->kvm, sregs->cr3 >> PAGE_SHIFT)) - vcpu->arch.cr3 = sregs->cr3; - else - set_bit(KVM_REQ_TRIPLE_FAULT, &vcpu->requests); - up_read(&vcpu->kvm->slots_lock); + vcpu->arch.cr3 = sregs->cr3; kvm_set_cr8(vcpu, sregs->cr8); |