Commit 8542a8f9 authored by Eric Auger's avatar Eric Auger Committed by Marc Zyngier
Browse files

KVM: arm64: vgic-v3: Fix error handling in vgic_v3_set_redist_base() 



vgic_v3_insert_redist_region() may succeed while
vgic_register_all_redist_iodevs fails. For example this happens
while adding a redistributor region overlapping a dist region. The
failure only is detected on vgic_register_all_redist_iodevs when
vgic_v3_check_base() gets called in vgic_register_redist_iodev().

In such a case, remove the newly added redistributor region and free
it.

Signed-off-by: default avatarEric Auger <eric.auger@redhat.com>
Signed-off-by: default avatarMarc Zyngier <maz@kernel.org>
Link: https://lore.kernel.org/r/20210405163941.510258-4-eric.auger@redhat.com
parent 53b16dd6

arch/arm64/kvm/vgic/vgic-mmio-v3.c

+7 −1
Original line number Diff line number Diff line
@@ -861,8 +861,14 @@ int vgic_v3_set_redist_base(struct kvm *kvm, u32 index, u64 addr, u32 count) 
	 * afterwards will register the iodevs when needed.

	 */

	ret = vgic_register_all_redist_iodevs(kvm);

	if (ret)

	if (ret) {

		struct vgic_redist_region *rdreg;



		rdreg = vgic_v3_rdist_region_from_index(kvm, index);

		list_del(&rdreg->list);

		kfree(rdreg);

		return ret;

	}



	return 0;

}