From: Greg Kroah-Hartman Date: Sat, 12 Mar 2022 13:13:47 +0000 (+0100) Subject: 5.15-stable patches X-Git-Tag: v4.9.307~27 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ee0ef673570e93a6a7e05ed43a489322da4134a3;p=thirdparty%2Fkernel%2Fstable-queue.git 5.15-stable patches added patches: kvm-x86-mmu-kvm_faultin_pfn-has-to-return-false-if-pfh-is-returned.patch --- diff --git a/queue-5.15/kvm-x86-mmu-kvm_faultin_pfn-has-to-return-false-if-pfh-is-returned.patch b/queue-5.15/kvm-x86-mmu-kvm_faultin_pfn-has-to-return-false-if-pfh-is-returned.patch new file mode 100644 index 00000000000..25e55060d47 --- /dev/null +++ b/queue-5.15/kvm-x86-mmu-kvm_faultin_pfn-has-to-return-false-if-pfh-is-returned.patch @@ -0,0 +1,35 @@ +From a7cc099f2ec3117678adeb69749bef7e9dde3148 Mon Sep 17 00:00:00 2001 +From: Andrei Vagin +Date: Fri, 15 Oct 2021 09:32:21 -0700 +Subject: KVM: x86/mmu: kvm_faultin_pfn has to return false if pfh is returned + +From: Andrei Vagin + +commit a7cc099f2ec3117678adeb69749bef7e9dde3148 upstream. + +This looks like a typo in 8f32d5e563cb. This change didn't intend to do +any functional changes. + +The problem was caught by gVisor tests. + +Fixes: 8f32d5e563cb ("KVM: x86/mmu: allow kvm_faultin_pfn to return page fault handling code") +Cc: Maxim Levitsky +Cc: Paolo Bonzini +Signed-off-by: Andrei Vagin +Message-Id: <20211015163221.472508-1-avagin@gmail.com> +Signed-off-by: Paolo Bonzini +Signed-off-by: Greg Kroah-Hartman +--- + arch/x86/kvm/mmu/mmu.c | 1 + + 1 file changed, 1 insertion(+) + +--- a/arch/x86/kvm/mmu/mmu.c ++++ b/arch/x86/kvm/mmu/mmu.c +@@ -3967,6 +3967,7 @@ static bool kvm_faultin_pfn(struct kvm_v + + *pfn = __gfn_to_pfn_memslot(slot, gfn, false, NULL, + write, writable, hva); ++ return false; + + out_retry: + *r = RET_PF_RETRY; diff --git a/queue-5.15/series b/queue-5.15/series index 6ebb10052d5..b401e50145b 100644 --- a/queue-5.15/series +++ b/queue-5.15/series @@ -85,3 +85,4 @@ arm64-dts-marvell-armada-37xx-remap-io-space-to-bus-address-0x0.patch arm64-ensure-execute-only-permissions-are-not-allowed-without-epan.patch arm64-kasan-fix-include-error-in-mte-functions.patch swiotlb-rework-fix-info-leak-with-dma_from_device.patch +kvm-x86-mmu-kvm_faultin_pfn-has-to-return-false-if-pfh-is-returned.patch