Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 43336ea7 authored by Eric Auger's avatar Eric Auger Committed by Sasha Levin
Browse files

KVM: arm/arm64: Fix KVM_VGIC_V3_ADDR_TYPE_REDIST read 



commit 94ac0835391efc1a30feda6fc908913ec012951e upstream.

When reading the base address of the a REDIST region
through KVM_VGIC_V3_ADDR_TYPE_REDIST we expect the
redistributor region list to be populated with a single
element.

However list_first_entry() expects the list to be non empty.
Instead we should use list_first_entry_or_null which effectively
returns NULL if the list is empty.

Fixes: dbd9733a ("KVM: arm/arm64: Replace the single rdist region by a list")
Cc: <Stable@vger.kernel.org> # v4.18+
Signed-off-by: default avatarEric Auger <eric.auger@redhat.com>
Reported-by: default avatarGavin Shan <gshan@redhat.com>
Signed-off-by: default avatarMarc Zyngier <maz@kernel.org>
Link: https://lore.kernel.org/r/20210412150034.29185-1-eric.auger@redhat.com


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent ede182d2

virt/kvm/arm/vgic/vgic-kvm-device.c

+2 −2
Original line number Diff line number Diff line
@@ -95,7 +95,7 @@ int kvm_vgic_addr(struct kvm *kvm, unsigned long type, u64 *addr, bool write) 
			r = vgic_v3_set_redist_base(kvm, 0, *addr, 0);

			goto out;

		}

		rdreg = list_first_entry(&vgic->rd_regions,

		rdreg = list_first_entry_or_null(&vgic->rd_regions,

						 struct vgic_redist_region, list);

		if (!rdreg)

			addr_ptr = &undef_value;