From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Mon, 16 Mar 2020 08:27:59 +0000 (+0100)
Subject: 4.19-stable patches
X-Git-Tag: v4.19.110~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1241c75a34f61c330c58bdb66947677a79da05c7;p=thirdparty%2Fkernel%2Fstable-queue.git

4.19-stable patches

added patches:
	kvm-svm-fix-up-incorrect-backport.patch
---

diff --git a/queue-4.19/kvm-svm-fix-up-incorrect-backport.patch b/queue-4.19/kvm-svm-fix-up-incorrect-backport.patch
new file mode 100644
index 00000000000..2d9e139ead1
--- /dev/null
+++ b/queue-4.19/kvm-svm-fix-up-incorrect-backport.patch
@@ -0,0 +1,33 @@
+From a275b00c23d0360493eb5fee114148feee9cee7a Mon Sep 17 00:00:00 2001
+From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+Date: Mon, 16 Mar 2020 09:25:06 +0100
+Subject: KVM: SVM: fix up incorrect backport
+
+From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+When I backported 52918ed5fcf0 ("KVM: SVM: Override default MMIO mask if
+memory encryption is enabled") to 4.19 (which resulted in commit
+a4e761c9f63a ("KVM: SVM: Override default MMIO mask if memory encryption
+is enabled")), I messed up the call to kvm_mmu_set_mmio_spte_mask()
+
+Fix that here now.
+
+Reported-by: Tom Lendacky <thomas.lendacky@amd.com>
+Cc: Sean Christopherson <sean.j.christopherson@intel.com>
+Cc: Paolo Bonzini <pbonzini@redhat.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ arch/x86/kvm/svm.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/arch/x86/kvm/svm.c
++++ b/arch/x86/kvm/svm.c
+@@ -1336,7 +1336,7 @@ static __init void svm_adjust_mmio_mask(
+ 	 */
+ 	mask = (mask_bit < 52) ? rsvd_bits(mask_bit, 51) | PT_PRESENT_MASK : 0;
+ 
+-	kvm_mmu_set_mmio_spte_mask(mask, PT_WRITABLE_MASK | PT_USER_MASK);
++	kvm_mmu_set_mmio_spte_mask(mask, mask);
+ }
+ 
+ static __init int svm_hardware_setup(void)
diff --git a/queue-4.19/series b/queue-4.19/series
new file mode 100644
index 00000000000..6150c3bd14e
--- /dev/null
+++ b/queue-4.19/series
@@ -0,0 +1 @@
+kvm-svm-fix-up-incorrect-backport.patch