4.4-stable patches

added patches:
	kvm-fix-previous-commit-for-32-bit-builds.patch

diff --git a/queue-4.4/kvm-fix-previous-commit-for-32-bit-builds.patch b/queue-4.4/kvm-fix-previous-commit-for-32-bit-builds.patch
new file mode 100644 (file)
index 0000000..b513868
--- /dev/null
+++ b/queue-4.4/kvm-fix-previous-commit-for-32-bit-builds.patch
@@ -0,0 +1,33 @@
+From 4422829e8053068e0225e4d0ef42dc41ea7c9ef5 Mon Sep 17 00:00:00 2001
+From: Paolo Bonzini <pbonzini@redhat.com>
+Date: Wed, 9 Jun 2021 01:49:13 -0400
+Subject: kvm: fix previous commit for 32-bit builds
+
+From: Paolo Bonzini <pbonzini@redhat.com>
+
+commit 4422829e8053068e0225e4d0ef42dc41ea7c9ef5 upstream.
+
+array_index_nospec does not work for uint64_t on 32-bit builds.
+However, the size of a memory slot must be less than 20 bits wide
+on those system, since the memory slot must fit in the user
+address space.  So just store it in an unsigned long.
+
+Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ include/linux/kvm_host.h |    4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+--- a/include/linux/kvm_host.h
++++ b/include/linux/kvm_host.h
+@@ -959,8 +959,8 @@ __gfn_to_hva_memslot(struct kvm_memory_s
+        * table walks, do not let the processor speculate loads outside
+        * the guest's registered memslots.
+        */
+-      unsigned long offset = array_index_nospec(gfn - slot->base_gfn,
+-                                                slot->npages);
++      unsigned long offset = gfn - slot->base_gfn;
++      offset = array_index_nospec(offset, slot->npages);
+       return slot->userspace_addr + offset * PAGE_SIZE;
+ }
+ 

diff --git a/queue-4.4/series b/queue-4.4/series
index 640afd9fd1faa91850a503440faaac41e4c1e41c..bac400b32ccafdfc70723bb2d9eacbf20fa26c46 100644 (file)
--- a/queue-4.4/series
+++ b/queue-4.4/series
@@ -28,3 +28,4 @@ usb-gadget-eem-fix-wrong-eem-header-operation.patch
 perf-fix-data-race-between-pin_count-increment-decrement.patch
 nfs-fix-a-potential-null-dereference-in-nfs_get_clie.patch
 perf-session-correct-buffer-copying-when-peeking-eve.patch
+kvm-fix-previous-commit-for-32-bit-builds.patch