From 0720f431cb15dba12e8a9ff6ddc7adf788e40f0f Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Mon, 15 Mar 2021 13:04:54 +0100 Subject: [PATCH] 4.4-stable patches added patches: kvm-arm64-fix-exclusive-limit-for-ipa-size.patch --- ...m64-fix-exclusive-limit-for-ipa-size.patch | 46 +++++++++++++++++++ queue-4.4/series | 1 + 2 files changed, 47 insertions(+) create mode 100644 queue-4.4/kvm-arm64-fix-exclusive-limit-for-ipa-size.patch diff --git a/queue-4.4/kvm-arm64-fix-exclusive-limit-for-ipa-size.patch b/queue-4.4/kvm-arm64-fix-exclusive-limit-for-ipa-size.patch new file mode 100644 index 00000000000..b8bafcf4450 --- /dev/null +++ b/queue-4.4/kvm-arm64-fix-exclusive-limit-for-ipa-size.patch @@ -0,0 +1,46 @@ +From foo@baz Mon Mar 15 01:04:46 PM CET 2021 +From: Marc Zyngier +Date: Mon, 15 Mar 2021 11:46:46 +0000 +Subject: KVM: arm64: Fix exclusive limit for IPA size +To: gregkh@linuxfoundation.org +Cc: kernel-team@android.com, kvmarm@lists.cs.columbia.edu, Eric Auger , stable@vger.kernel.org, Andrew Jones +Message-ID: <20210315114646.4137198-1-maz@kernel.org> + +From: Marc Zyngier + +Commit 262b003d059c6671601a19057e9fe1a5e7f23722 upstream. + +When registering a memslot, we check the size and location of that +memslot against the IPA size to ensure that we can provide guest +access to the whole of the memory. + +Unfortunately, this check rejects memslot that end-up at the exact +limit of the addressing capability for a given IPA size. For example, +it refuses the creation of a 2GB memslot at 0x8000000 with a 32bit +IPA space. + +Fix it by relaxing the check to accept a memslot reaching the +limit of the IPA space. + +Fixes: c3058d5da222 ("arm/arm64: KVM: Ensure memslots are within KVM_PHYS_SIZE") +Reviewed-by: Eric Auger +Signed-off-by: Marc Zyngier +Cc: stable@vger.kernel.org # 4.4, 4.9 +Reviewed-by: Andrew Jones +Link: https://lore.kernel.org/r/20210311100016.3830038-3-maz@kernel.org +Signed-off-by: Greg Kroah-Hartman +--- + arch/arm/kvm/mmu.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/arch/arm/kvm/mmu.c ++++ b/arch/arm/kvm/mmu.c +@@ -1789,7 +1789,7 @@ int kvm_arch_prepare_memory_region(struc + * Prevent userspace from creating a memory region outside of the IPA + * space addressable by the KVM guest IPA space. + */ +- if (memslot->base_gfn + memslot->npages >= ++ if (memslot->base_gfn + memslot->npages > + (KVM_PHYS_SIZE >> PAGE_SHIFT)) + return -EFAULT; + diff --git a/queue-4.4/series b/queue-4.4/series index 36a928a234f..34469143de4 100644 --- a/queue-4.4/series +++ b/queue-4.4/series @@ -67,3 +67,4 @@ alpha-get-rid-of-tail-zeroing-in-__copy_user.patch alpha-switch-__copy_user-and-__do_clean_user-to-normal-calling-conventions.patch powerpc-64s-fix-instruction-encoding-for-lis-in-ppc_function_entry.patch media-hdpvr-fix-an-error-handling-path-in-hdpvr_probe.patch +kvm-arm64-fix-exclusive-limit-for-ipa-size.patch -- 2.47.3