diff options
| author | Marcelo Tosatti | 2014-01-03 20:09:32 +0100 |
|---|---|---|
| committer | Paolo Bonzini | 2014-01-15 12:16:16 +0100 |
| commit | 37f6a4e237303549c8676dfe1fd1991ceab512eb (patch) | |
| tree | e24c69c991f4c9624aaaed1bd2843a34adcd8bfd /arch/x86/kvm/mmu.c | |
| parent | Merge tag 'kvm-arm-for-3.14' of git://git.linaro.org/people/christoffer.dall/... (diff) | |
| download | kernel-qcow2-linux-37f6a4e237303549c8676dfe1fd1991ceab512eb.tar.gz kernel-qcow2-linux-37f6a4e237303549c8676dfe1fd1991ceab512eb.tar.xz kernel-qcow2-linux-37f6a4e237303549c8676dfe1fd1991ceab512eb.zip | |
KVM: x86: handle invalid root_hpa everywhere
Rom Freiman <rom@stratoscale.com> notes other code paths vulnerable to
bug fixed by 989c6b34f6a9480e397b.
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
Diffstat (limited to 'arch/x86/kvm/mmu.c')
| -rw-r--r-- | arch/x86/kvm/mmu.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/arch/x86/kvm/mmu.c b/arch/x86/kvm/mmu.c index 31a570287fcc..e50425d0f5f7 100644 --- a/arch/x86/kvm/mmu.c +++ b/arch/x86/kvm/mmu.c @@ -2832,6 +2832,9 @@ static bool fast_page_fault(struct kvm_vcpu *vcpu, gva_t gva, int level, bool ret = false; u64 spte = 0ull; + if (!VALID_PAGE(vcpu->arch.mmu.root_hpa)) + return false; + if (!page_fault_can_be_fast(error_code)) return false; @@ -3227,6 +3230,9 @@ static u64 walk_shadow_page_get_mmio_spte(struct kvm_vcpu *vcpu, u64 addr) struct kvm_shadow_walk_iterator iterator; u64 spte = 0ull; + if (!VALID_PAGE(vcpu->arch.mmu.root_hpa)) + return spte; + walk_shadow_page_lockless_begin(vcpu); for_each_shadow_entry_lockless(vcpu, addr, iterator, spte) if (!is_shadow_present_pte(spte)) @@ -4513,6 +4519,9 @@ int kvm_mmu_get_spte_hierarchy(struct kvm_vcpu *vcpu, u64 addr, u64 sptes[4]) u64 spte; int nr_sptes = 0; + if (!VALID_PAGE(vcpu->arch.mmu.root_hpa)) + return nr_sptes; + walk_shadow_page_lockless_begin(vcpu); for_each_shadow_entry_lockless(vcpu, addr, iterator, spte) { sptes[iterator.level-1] = spte; |