diff for duplicates of <14715136428861@kroah.com> diff --git a/a/content_digest b/N1/content_digest index 0a72505..4cb2fd6 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -10,8 +10,7 @@ ralf@linux-mips.org rkrcmar@redhat.com " stable@vger.kernel.org\0" - "Cc\0<stable@vger.kernel.org>" - " <stable-commits@vger.kernel.org>\0" + "Cc\0stable-commits@vger.kernel.org\0" "\00:1\0" "b\0" "\n" @@ -29,4 +28,4 @@ "If you, or anyone else, feels it should not be added to the stable tree,\n" please let <stable@vger.kernel.org> know about it. -b682edb45b2b988fbd2f1a8d5c6050490020ad44795df3111413d65637a5865a +1ceaf92a763ba9e551742d2660972736d9bb7627282526478a1a13c358c6f9c7
diff --git a/a/1.txt b/N2/1.txt index 3467916..da07cb2 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -12,3 +12,54 @@ and it can be found in the queue-4.4 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let <stable@vger.kernel.org> know about it. + + +>From james.hogan@imgtec.com Thu Aug 18 11:44:51 2016 +From: James Hogan <james.hogan@imgtec.com> +Date: Thu, 18 Aug 2016 10:05:31 +0100 +Subject: [PATCH BACKPORT 3.17-4.4 3/4] MIPS: KVM: Fix gfn range check in kseg0 tlb faults +To: <stable@vger.kernel.org> +Cc: James Hogan <james.hogan@imgtec.com>, Paolo Bonzini <pbonzini@redhat.com>, Radim Krčmář <rkrcmar@redhat.com>, Ralf Baechle <ralf@linux-mips.org>, <linux-mips@linux-mips.org>, <kvm@vger.kernel.org> +Message-ID: <2c09ac935cd3721a0212d82eca7f9290481d5b4c.1471018436.git-series.james.hogan@imgtec.com> + +From: James Hogan <james.hogan@imgtec.com> + +commit 0741f52d1b980dbeb290afe67d88fc2928edd8ab upstream. + +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: 858dd5d45733 ("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 +Signed-off-by: Radim Krčmář <rkrcmar@redhat.com> +[james.hogan@imgtec.com: Backport to v3.17.y - v4.4.y] +Signed-off-by: James Hogan <james.hogan@imgtec.com> +Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> +--- + arch/mips/kvm/tlb.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/arch/mips/kvm/tlb.c ++++ b/arch/mips/kvm/tlb.c +@@ -276,7 +276,7 @@ int kvm_mips_handle_kseg0_tlb_fault(unsi + } + + 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(); + + +Patches currently in stable-queue which might be from james.hogan@imgtec.com are + +queue-4.4/mips-kvm-add-missing-gfn-range-check.patch +queue-4.4/mips-kvm-propagate-kseg0-mapped-tlb-fault-errors.patch +queue-4.4/mips-kvm-fix-mapped-fault-broken-commpage-handling.patch +queue-4.4/mips-kvm-fix-gfn-range-check-in-kseg0-tlb-faults.patch diff --git a/a/content_digest b/N2/content_digest index 0a72505..0b11d08 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -27,6 +27,57 @@ "and it can be found in the queue-4.4 subdirectory.\n" "\n" "If you, or anyone else, feels it should not be added to the stable tree,\n" - please let <stable@vger.kernel.org> know about it. + "please let <stable@vger.kernel.org> know about it.\n" + "\n" + "\n" + ">From james.hogan@imgtec.com Thu Aug 18 11:44:51 2016\n" + "From: James Hogan <james.hogan@imgtec.com>\n" + "Date: Thu, 18 Aug 2016 10:05:31 +0100\n" + "Subject: [PATCH BACKPORT 3.17-4.4 3/4] MIPS: KVM: Fix gfn range check in kseg0 tlb faults\n" + "To: <stable@vger.kernel.org>\n" + "Cc: James Hogan <james.hogan@imgtec.com>, Paolo Bonzini <pbonzini@redhat.com>, Radim Kr\304\215m\303\241\305\231 <rkrcmar@redhat.com>, Ralf Baechle <ralf@linux-mips.org>, <linux-mips@linux-mips.org>, <kvm@vger.kernel.org>\n" + "Message-ID: <2c09ac935cd3721a0212d82eca7f9290481d5b4c.1471018436.git-series.james.hogan@imgtec.com>\n" + "\n" + "From: James Hogan <james.hogan@imgtec.com>\n" + "\n" + "commit 0741f52d1b980dbeb290afe67d88fc2928edd8ab upstream.\n" + "\n" + "Two consecutive gfns are loaded into host TLB, so ensure the range check\n" + "isn't off by one if guest_pmap_npages is odd.\n" + "\n" + "Fixes: 858dd5d45733 (\"KVM/MIPS32: MMU/TLB operations for the Guest.\")\n" + "Signed-off-by: James Hogan <james.hogan@imgtec.com>\n" + "Cc: Paolo Bonzini <pbonzini@redhat.com>\n" + "Cc: \"Radim Kr\304\215m\303\241\305\231\" <rkrcmar@redhat.com>\n" + "Cc: Ralf Baechle <ralf@linux-mips.org>\n" + "Cc: linux-mips@linux-mips.org\n" + "Cc: kvm@vger.kernel.org\n" + "Signed-off-by: Radim Kr\304\215m\303\241\305\231 <rkrcmar@redhat.com>\n" + "[james.hogan@imgtec.com: Backport to v3.17.y - v4.4.y]\n" + "Signed-off-by: James Hogan <james.hogan@imgtec.com>\n" + "Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>\n" + "---\n" + " arch/mips/kvm/tlb.c | 2 +-\n" + " 1 file changed, 1 insertion(+), 1 deletion(-)\n" + "\n" + "--- a/arch/mips/kvm/tlb.c\n" + "+++ b/arch/mips/kvm/tlb.c\n" + "@@ -276,7 +276,7 @@ int kvm_mips_handle_kseg0_tlb_fault(unsi\n" + " \t}\n" + " \n" + " \tgfn = (KVM_GUEST_CPHYSADDR(badvaddr) >> PAGE_SHIFT);\n" + "-\tif (gfn >= kvm->arch.guest_pmap_npages) {\n" + "+\tif ((gfn | 1) >= kvm->arch.guest_pmap_npages) {\n" + " \t\tkvm_err(\"%s: Invalid gfn: %#llx, BadVaddr: %#lx\\n\", __func__,\n" + " \t\t\tgfn, badvaddr);\n" + " \t\tkvm_mips_dump_host_tlbs();\n" + "\n" + "\n" + "Patches currently in stable-queue which might be from james.hogan@imgtec.com are\n" + "\n" + "queue-4.4/mips-kvm-add-missing-gfn-range-check.patch\n" + "queue-4.4/mips-kvm-propagate-kseg0-mapped-tlb-fault-errors.patch\n" + "queue-4.4/mips-kvm-fix-mapped-fault-broken-commpage-handling.patch\n" + queue-4.4/mips-kvm-fix-gfn-range-check-in-kseg0-tlb-faults.patch -b682edb45b2b988fbd2f1a8d5c6050490020ad44795df3111413d65637a5865a +35aa9bf5701ee43f8a4ebe4f2f122a8453edbdecdd22901a65508c95c74ecb6c
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.