Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
From:   Eric Auger <eric.auger@redhat.com>
To:     eric.auger.pro@gmail.com, eric.auger@redhat.com, maz@kernel.org,
        linux-kernel@vger.kernel.org, kvmarm@lists.cs.columbia.edu
Subject: [PATCH] KVM: arm/arm64: vgic-its: Fix restoration of unmapped collections
Date:   Fri, 13 Dec 2019 10:42:37 +0100
Message-Id: <20191213094237.19627-1-eric.auger@redhat.com>
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk

Saving/restoring an unmapped collection is a valid scenario. For
example this happens if a MAPTI command was sent, featuring an
unmapped collection. At the moment the CTE fails to be restored.
Only compare against the number of online vcpus if the rdist
base is set.

Cc: stable@vger.kernel.org # v4.11+
Fixes: ea1ad53e1e31a ("KVM: arm64: vgic-its: Collection table save/restor=
e")
Signed-off-by: Eric Auger <eric.auger@redhat.com>
---
 virt/kvm/arm/vgic/vgic-its.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/virt/kvm/arm/vgic/vgic-its.c b/virt/kvm/arm/vgic/vgic-its.c
index 98c7360d9fb7..17920d1b350a 100644
--- a/virt/kvm/arm/vgic/vgic-its.c
+++ b/virt/kvm/arm/vgic/vgic-its.c
@@ -2475,7 +2475,8 @@ static int vgic_its_restore_cte(struct vgic_its *it=
s, gpa_t gpa, int esz)
 	target_addr =3D (u32)(val >> KVM_ITS_CTE_RDBASE_SHIFT);
 	coll_id =3D val & KVM_ITS_CTE_ICID_MASK;
=20
-	if (target_addr >=3D atomic_read(&kvm->online_vcpus))
+	if (target_addr !=3D COLLECTION_NOT_MAPPED &&
+	    target_addr >=3D atomic_read(&kvm->online_vcpus))
 		return -EINVAL;
=20
 	collection =3D find_collection(its, coll_id);
--=20
2.20.1