5.10-stable patches

added patches:
	x86-ioremap-fix-page-aligned-size-calculation-in-__ioremap_caller.patch

diff --git a/queue-5.10/series b/queue-5.10/series
index 5780bc8ffe8099374645133d695ebd794920a104..95172f4143a7be7287f461d190fc0ab3c4a10ba6 100644 (file)
--- a/queue-5.10/series
+++ b/queue-5.10/series
@@ -121,3 +121,4 @@ gcov-clang-fix-the-buffer-overflow-issue.patch
 mm-vmscan-fix-extreme-overreclaim-and-swap-floods.patch
 kvm-x86-nsvm-leave-nested-mode-on-vcpu-free.patch
 kvm-x86-remove-exit_int_info-warning-in-svm_handle_exit.patch
+x86-ioremap-fix-page-aligned-size-calculation-in-__ioremap_caller.patch

diff --git a/queue-5.10/x86-ioremap-fix-page-aligned-size-calculation-in-__ioremap_caller.patch b/queue-5.10/x86-ioremap-fix-page-aligned-size-calculation-in-__ioremap_caller.patch
new file mode 100644 (file)
index 0000000..d1f64ba
--- /dev/null
+++ b/queue-5.10/x86-ioremap-fix-page-aligned-size-calculation-in-__ioremap_caller.patch
@@ -0,0 +1,49 @@
+From 4dbd6a3e90e03130973688fd79e19425f720d999 Mon Sep 17 00:00:00 2001
+From: Michael Kelley <mikelley@microsoft.com>
+Date: Wed, 16 Nov 2022 10:41:24 -0800
+Subject: x86/ioremap: Fix page aligned size calculation in __ioremap_caller()
+
+From: Michael Kelley <mikelley@microsoft.com>
+
+commit 4dbd6a3e90e03130973688fd79e19425f720d999 upstream.
+
+Current code re-calculates the size after aligning the starting and
+ending physical addresses on a page boundary. But the re-calculation
+also embeds the masking of high order bits that exceed the size of
+the physical address space (via PHYSICAL_PAGE_MASK). If the masking
+removes any high order bits, the size calculation results in a huge
+value that is likely to immediately fail.
+
+Fix this by re-calculating the page-aligned size first. Then mask any
+high order bits using PHYSICAL_PAGE_MASK.
+
+Fixes: ffa71f33a820 ("x86, ioremap: Fix incorrect physical address handling in PAE mode")
+Signed-off-by: Michael Kelley <mikelley@microsoft.com>
+Signed-off-by: Borislav Petkov <bp@suse.de>
+Acked-by: Dave Hansen <dave.hansen@linux.intel.com>
+Cc: <stable@kernel.org>
+Link: https://lore.kernel.org/r/1668624097-14884-2-git-send-email-mikelley@microsoft.com
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ arch/x86/mm/ioremap.c |    8 +++++++-
+ 1 file changed, 7 insertions(+), 1 deletion(-)
+
+--- a/arch/x86/mm/ioremap.c
++++ b/arch/x86/mm/ioremap.c
+@@ -216,9 +216,15 @@ __ioremap_caller(resource_size_t phys_ad
+        * Mappings have to be page-aligned
+        */
+       offset = phys_addr & ~PAGE_MASK;
+-      phys_addr &= PHYSICAL_PAGE_MASK;
++      phys_addr &= PAGE_MASK;
+       size = PAGE_ALIGN(last_addr+1) - phys_addr;
+ 
++      /*
++       * Mask out any bits not part of the actual physical
++       * address, like memory encryption bits.
++       */
++      phys_addr &= PHYSICAL_PAGE_MASK;
++
+       retval = memtype_reserve(phys_addr, (u64)phys_addr + size,
+                                               pcm, &new_pcm);
+       if (retval) {