* Re: [PATCH][stable-4.{4,9,14,19}] KVM: arm64: Fix exclusive limit for IPA size
2021-03-15 11:08 [PATCH][stable-4.{4, 9, 14, 19}] KVM: arm64: Fix exclusive limit for IPA size Marc Zyngier
@ 2021-03-15 11:30 ` Greg KH
2021-03-15 11:44 ` [PATCH][stable-4.{4, 9, 14, 19}] " Marc Zyngier
2021-03-15 11:30 ` Patch "KVM: arm64: Fix exclusive limit for IPA size" has been added to the 4.14-stable tree gregkh
2021-03-15 11:31 ` Patch "KVM: arm64: Fix exclusive limit for IPA size" has been added to the 4.19-stable tree gregkh
2 siblings, 1 reply; 5+ messages in thread
From: Greg KH @ 2021-03-15 11:30 UTC (permalink / raw)
To: Marc Zyngier; +Cc: kernel-team, kvmarm, stable
On Mon, Mar 15, 2021 at 11:08:33AM +0000, Marc Zyngier wrote:
> 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 <eric.auger@redhat.com>
> Signed-off-by: Marc Zyngier <maz@kernel.org>
> Cc: stable@vger.kernel.org # 4.4, 4.9, 4.14, 4.19
> Reviewed-by: Andrew Jones <drjones@redhat.com>
> Link: https://lore.kernel.org/r/20210311100016.3830038-3-maz@kernel.org
> ---
> virt/kvm/arm/mmu.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
This file does not exist in 4.4.y or 4.9.y, so I can't apply it there :(
Queued up everywhere else, and also the other backports you sent,
thanks.
gre gk-h
_______________________________________________
kvmarm mailing list
kvmarm@lists.cs.columbia.edu
https://lists.cs.columbia.edu/mailman/listinfo/kvmarm
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PATCH][stable-4.{4, 9, 14, 19}] KVM: arm64: Fix exclusive limit for IPA size
2021-03-15 11:30 ` [PATCH][stable-4.{4,9,14,19}] " Greg KH
@ 2021-03-15 11:44 ` Marc Zyngier
0 siblings, 0 replies; 5+ messages in thread
From: Marc Zyngier @ 2021-03-15 11:44 UTC (permalink / raw)
To: Greg KH; +Cc: kernel-team, kvmarm, stable
On 2021-03-15 11:30, Greg KH wrote:
> On Mon, Mar 15, 2021 at 11:08:33AM +0000, Marc Zyngier wrote:
>> 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 <eric.auger@redhat.com>
>> Signed-off-by: Marc Zyngier <maz@kernel.org>
>> Cc: stable@vger.kernel.org # 4.4, 4.9, 4.14, 4.19
>> Reviewed-by: Andrew Jones <drjones@redhat.com>
>> Link:
>> https://lore.kernel.org/r/20210311100016.3830038-3-maz@kernel.org
>> ---
>> virt/kvm/arm/mmu.c | 2 +-
>> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> This file does not exist in 4.4.y or 4.9.y, so I can't apply it there
> :(
Ah, git rename handling fixed that up for me, and I didn't pay
attention to the resulting path... Sorry about that.
I'll resend the patch for 4.4 and 4.9
Thanks,
M.
--
Jazz is not dead. It just smells funny...
_______________________________________________
kvmarm mailing list
kvmarm@lists.cs.columbia.edu
https://lists.cs.columbia.edu/mailman/listinfo/kvmarm
^ permalink raw reply [flat|nested] 5+ messages in thread
* Patch "KVM: arm64: Fix exclusive limit for IPA size" has been added to the 4.14-stable tree
2021-03-15 11:08 [PATCH][stable-4.{4, 9, 14, 19}] KVM: arm64: Fix exclusive limit for IPA size Marc Zyngier
2021-03-15 11:30 ` [PATCH][stable-4.{4,9,14,19}] " Greg KH
@ 2021-03-15 11:30 ` gregkh
2021-03-15 11:31 ` Patch "KVM: arm64: Fix exclusive limit for IPA size" has been added to the 4.19-stable tree gregkh
2 siblings, 0 replies; 5+ messages in thread
From: gregkh @ 2021-03-15 11:30 UTC (permalink / raw)
To: drjones, eric.auger, gregkh, kernel-team, kvmarm, maz; +Cc: stable-commits
This is a note to let you know that I've just added the patch titled
KVM: arm64: Fix exclusive limit for IPA size
to the 4.14-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
kvm-arm64-fix-exclusive-limit-for-ipa-size.patch
and it can be found in the queue-4.14 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@vger.kernel.org> know about it.
From foo@baz Mon Mar 15 12:28:42 PM CET 2021
From: Marc Zyngier <maz@kernel.org>
Date: Mon, 15 Mar 2021 11:08:33 +0000
Subject: KVM: arm64: Fix exclusive limit for IPA size
To: gregkh@linuxfoundation.org
Cc: kvmarm@lists.cs.columbia.edu, kernel-team@android.com, Eric Auger <eric.auger@redhat.com>, stable@vger.kernel.org, Andrew Jones <drjones@redhat.com>
Message-ID: <20210315110833.4135927-1-maz@kernel.org>
From: Marc Zyngier <maz@kernel.org>
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 <eric.auger@redhat.com>
Signed-off-by: Marc Zyngier <maz@kernel.org>
Cc: stable@vger.kernel.org # 4.4, 4.9, 4.14, 4.19
Reviewed-by: Andrew Jones <drjones@redhat.com>
Link: https://lore.kernel.org/r/20210311100016.3830038-3-maz@kernel.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---
virt/kvm/arm/mmu.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- a/virt/kvm/arm/mmu.c
+++ b/virt/kvm/arm/mmu.c
@@ -1870,7 +1870,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;
Patches currently in stable-queue which might be from maz@kernel.org are
queue-4.14/kvm-arm64-fix-exclusive-limit-for-ipa-size.patch
_______________________________________________
kvmarm mailing list
kvmarm@lists.cs.columbia.edu
https://lists.cs.columbia.edu/mailman/listinfo/kvmarm
^ permalink raw reply [flat|nested] 5+ messages in thread* Patch "KVM: arm64: Fix exclusive limit for IPA size" has been added to the 4.19-stable tree
2021-03-15 11:08 [PATCH][stable-4.{4, 9, 14, 19}] KVM: arm64: Fix exclusive limit for IPA size Marc Zyngier
2021-03-15 11:30 ` [PATCH][stable-4.{4,9,14,19}] " Greg KH
2021-03-15 11:30 ` Patch "KVM: arm64: Fix exclusive limit for IPA size" has been added to the 4.14-stable tree gregkh
@ 2021-03-15 11:31 ` gregkh
2 siblings, 0 replies; 5+ messages in thread
From: gregkh @ 2021-03-15 11:31 UTC (permalink / raw)
To: drjones, eric.auger, gregkh, kernel-team, kvmarm, maz; +Cc: stable-commits
This is a note to let you know that I've just added the patch titled
KVM: arm64: Fix exclusive limit for IPA size
to the 4.19-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
kvm-arm64-fix-exclusive-limit-for-ipa-size.patch
and it can be found in the queue-4.19 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@vger.kernel.org> know about it.
From foo@baz Mon Mar 15 12:28:26 PM CET 2021
From: Marc Zyngier <maz@kernel.org>
Date: Mon, 15 Mar 2021 11:08:33 +0000
Subject: KVM: arm64: Fix exclusive limit for IPA size
To: gregkh@linuxfoundation.org
Cc: kvmarm@lists.cs.columbia.edu, kernel-team@android.com, Eric Auger <eric.auger@redhat.com>, stable@vger.kernel.org, Andrew Jones <drjones@redhat.com>
Message-ID: <20210315110833.4135927-1-maz@kernel.org>
From: Marc Zyngier <maz@kernel.org>
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 <eric.auger@redhat.com>
Signed-off-by: Marc Zyngier <maz@kernel.org>
Cc: stable@vger.kernel.org # 4.4, 4.9, 4.14, 4.19
Reviewed-by: Andrew Jones <drjones@redhat.com>
Link: https://lore.kernel.org/r/20210311100016.3830038-3-maz@kernel.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---
virt/kvm/arm/mmu.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- a/virt/kvm/arm/mmu.c
+++ b/virt/kvm/arm/mmu.c
@@ -2080,7 +2080,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;
Patches currently in stable-queue which might be from maz@kernel.org are
queue-4.19/kvm-arm64-fix-exclusive-limit-for-ipa-size.patch
_______________________________________________
kvmarm mailing list
kvmarm@lists.cs.columbia.edu
https://lists.cs.columbia.edu/mailman/listinfo/kvmarm
^ permalink raw reply [flat|nested] 5+ messages in thread