Commit 0741f52d authored Aug 11, 2016 by James Hogan Committed by Radim Krčmář Aug 12, 2016

MIPS: KVM: Fix gfn range check in kseg0 tlb faults



Two consecutive gfns are loaded into host TLB, so ensure the range check
isn't off by one if guest_pmap_npages is odd.

Fixes: 858dd5d4 ("KVM/MIPS32: MMU/TLB operations for the Guest.")
Signed-off-by: James Hogan <james.hogan@imgtec.com>
Cc: Paolo Bonzini <pbonzini@redhat.com>
Cc: "Radim Krčmář" <rkrcmar@redhat.com>
Cc: Ralf Baechle <ralf@linux-mips.org>
Cc: linux-mips@linux-mips.org
Cc: kvm@vger.kernel.org
Cc: <stable@vger.kernel.org> # 3.10.x-
Signed-off-by: Radim Krčmář <rkrcmar@redhat.com>

parent 8985d503

arch/mips/kvm/mmu.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -99,7 +99,7 @@ int kvm_mips_handle_kseg0_tlb_fault(unsigned long badvaddr,
		}

		gfn = (KVM_GUEST_CPHYSADDR(badvaddr) >> PAGE_SHIFT);
		if (gfn >= kvm->arch.guest_pmap_npages) {
		if ((gfn \| 1) >= kvm->arch.guest_pmap_npages) {
		kvm_err("%s: Invalid gfn: %#llx, BadVaddr: %#lx\n", __func__,
		gfn, badvaddr);
		kvm_mips_dump_host_tlbs();