Linux KVM/arm64 development list
 help / color / mirror / Atom feed
From: Ricardo Koller <ricarkol@google.com>
To: kvm@vger.kernel.org, maz@kernel.org,
	kvmarm@lists.cs.columbia.edu,  drjones@redhat.com,
	eric.auger@redhat.com, alexandru.elisei@arm.com
Cc: pshier@google.com, Paolo Bonzini <pbonzini@redhat.com>, shuah@kernel.org
Subject: [PATCH v4 03/11] KVM: arm64: vgic-v2: Check cpu interface region is not above the VM IPA size
Date: Mon,  4 Oct 2021 18:19:13 -0700	[thread overview]
Message-ID: <20211005011921.437353-4-ricarkol@google.com> (raw)
In-Reply-To: <20211005011921.437353-1-ricarkol@google.com>

Verify that the GICv2 CPU interface does not extend beyond the
VM-specified IPA range (phys_size).

  base + size > phys_size AND base < phys_size

Add the missing check into kvm_vgic_addr() which is called when setting
the region. This patch also enables some superfluous checks for the
distributor (vgic_check_ioaddr was enough as alignment == size for the
distributors).

Reviewed-by: Eric Auger <eric.auger@redhat.com>
Signed-off-by: Ricardo Koller <ricarkol@google.com>
---
 arch/arm64/kvm/vgic/vgic-kvm-device.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/arch/arm64/kvm/vgic/vgic-kvm-device.c b/arch/arm64/kvm/vgic/vgic-kvm-device.c
index cc0ad227b380..08ae34b1a986 100644
--- a/arch/arm64/kvm/vgic/vgic-kvm-device.c
+++ b/arch/arm64/kvm/vgic/vgic-kvm-device.c
@@ -79,7 +79,7 @@ int kvm_vgic_addr(struct kvm *kvm, unsigned long type, u64 *addr, bool write)
 {
 	int r = 0;
 	struct vgic_dist *vgic = &kvm->arch.vgic;
-	phys_addr_t *addr_ptr, alignment;
+	phys_addr_t *addr_ptr, alignment, size;
 	u64 undef_value = VGIC_ADDR_UNDEF;
 
 	mutex_lock(&kvm->lock);
@@ -88,16 +88,19 @@ int kvm_vgic_addr(struct kvm *kvm, unsigned long type, u64 *addr, bool write)
 		r = vgic_check_type(kvm, KVM_DEV_TYPE_ARM_VGIC_V2);
 		addr_ptr = &vgic->vgic_dist_base;
 		alignment = SZ_4K;
+		size = KVM_VGIC_V2_DIST_SIZE;
 		break;
 	case KVM_VGIC_V2_ADDR_TYPE_CPU:
 		r = vgic_check_type(kvm, KVM_DEV_TYPE_ARM_VGIC_V2);
 		addr_ptr = &vgic->vgic_cpu_base;
 		alignment = SZ_4K;
+		size = KVM_VGIC_V2_CPU_SIZE;
 		break;
 	case KVM_VGIC_V3_ADDR_TYPE_DIST:
 		r = vgic_check_type(kvm, KVM_DEV_TYPE_ARM_VGIC_V3);
 		addr_ptr = &vgic->vgic_dist_base;
 		alignment = SZ_64K;
+		size = KVM_VGIC_V3_DIST_SIZE;
 		break;
 	case KVM_VGIC_V3_ADDR_TYPE_REDIST: {
 		struct vgic_redist_region *rdreg;
@@ -162,7 +165,7 @@ int kvm_vgic_addr(struct kvm *kvm, unsigned long type, u64 *addr, bool write)
 		goto out;
 
 	if (write) {
-		r = vgic_check_ioaddr(kvm, addr_ptr, *addr, alignment);
+		r = vgic_check_iorange(kvm, *addr_ptr, *addr, alignment, size);
 		if (!r)
 			*addr_ptr = *addr;
 	} else {
-- 
2.33.0.800.g4c38ced690-goog

_______________________________________________
kvmarm mailing list
kvmarm@lists.cs.columbia.edu
https://lists.cs.columbia.edu/mailman/listinfo/kvmarm

  parent reply	other threads:[~2021-10-05  1:19 UTC|newest]

Thread overview: 23+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-10-05  1:19 [PATCH v4 00/11] KVM: arm64: vgic: Missing checks for REDIST/CPU and ITS regions above the VM IPA size Ricardo Koller
2021-10-05  1:19 ` [PATCH v4 01/11] kvm: arm64: vgic: Introduce vgic_check_iorange Ricardo Koller
2021-10-05  1:19 ` [PATCH v4 02/11] KVM: arm64: vgic-v3: Check redist region is not above the VM IPA size Ricardo Koller
2021-10-05  1:19 ` Ricardo Koller [this message]
2021-10-05  1:19 ` [PATCH v4 04/11] KVM: arm64: vgic-v3: Check ITS " Ricardo Koller
2021-10-05  1:19 ` [PATCH v4 05/11] KVM: arm64: vgic: Drop vgic_check_ioaddr() Ricardo Koller
2021-10-05  7:56   ` Eric Auger
2021-10-05  1:19 ` [PATCH v4 06/11] KVM: arm64: selftests: Make vgic_init gic version agnostic Ricardo Koller
2021-10-06  9:46   ` Andrew Jones
2021-10-05  1:19 ` [PATCH v4 07/11] KVM: arm64: selftests: Make vgic_init/vm_gic_create " Ricardo Koller
2021-10-06  9:47   ` Andrew Jones
2021-10-05  1:19 ` [PATCH v4 08/11] KVM: arm64: selftests: Add some tests for GICv2 in vgic_init Ricardo Koller
2021-10-05  8:09   ` Eric Auger
2021-10-06  9:52   ` Andrew Jones
2021-10-05  1:19 ` [PATCH v4 09/11] KVM: arm64: selftests: Add tests for GIC redist/cpuif partially above IPA range Ricardo Koller
2021-10-05  8:12   ` Eric Auger
2021-10-06 10:07   ` Andrew Jones
2021-10-05  1:19 ` [PATCH v4 10/11] KVM: arm64: selftests: Add test for legacy GICv3 REDIST base " Ricardo Koller
2021-10-06 10:12   ` Andrew Jones
2021-10-05  1:19 ` [PATCH v4 11/11] KVM: arm64: selftests: Add init ITS device test Ricardo Koller
2021-10-05  8:06   ` Eric Auger
2021-10-06 10:13   ` Andrew Jones
2021-10-11  8:43 ` [PATCH v4 00/11] KVM: arm64: vgic: Missing checks for REDIST/CPU and ITS regions above the VM IPA size Marc Zyngier

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20211005011921.437353-4-ricarkol@google.com \
    --to=ricarkol@google.com \
    --cc=alexandru.elisei@arm.com \
    --cc=drjones@redhat.com \
    --cc=eric.auger@redhat.com \
    --cc=kvm@vger.kernel.org \
    --cc=kvmarm@lists.cs.columbia.edu \
    --cc=maz@kernel.org \
    --cc=pbonzini@redhat.com \
    --cc=pshier@google.com \
    --cc=shuah@kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox