]> git.proxmox.com Git - mirror_ubuntu-artful-kernel.git/commitdiff
KVM: PPC: NULL return of kvmppc_mmu_hpte_cache_next should be handled
authorZhouyi Zhou <zhouzhouyi@gmail.com>
Mon, 2 Dec 2013 10:21:58 +0000 (18:21 +0800)
committerAlexander Graf <agraf@suse.de>
Thu, 9 Jan 2014 09:15:11 +0000 (10:15 +0100)
NULL return of kvmppc_mmu_hpte_cache_next should be handled

Signed-off-by: Zhouyi Zhou <yizhouzhou@ict.ac.cn>
Signed-off-by: Alexander Graf <agraf@suse.de>
arch/powerpc/kvm/book3s_32_mmu_host.c

index 3a0abd2e5a15a2b4b3e3c3305408790193358b24..5fac89dfe4cdf2dd1673753d703dbf32c8b26b03 100644 (file)
@@ -243,6 +243,11 @@ next_pteg:
        /* Now tell our Shadow PTE code about the new page */
 
        pte = kvmppc_mmu_hpte_cache_next(vcpu);
+       if (!pte) {
+               kvm_release_pfn_clean(hpaddr >> PAGE_SHIFT);
+               r = -EAGAIN;
+               goto out;
+       }
 
        dprintk_mmu("KVM: %c%c Map 0x%llx: [%lx] 0x%llx (0x%llx) -> %lx\n",
                    orig_pte->may_write ? 'w' : '-',