Skip to contentSkip to conversation

KVM: arm/arm64: Fix KVM_VGIC_V3_ADDR_TYPE_REDIST read

PATCH Applied Eric Auger 3 participants 3 messages Apr 12, 2021 – Apr 13, 2021

Subsystems (3)
lore
Share & tools
lore

Eric Auger

author
#0 lore raw

PATCH 1/1 KVM: arm/arm64: Fix KVM_VGIC_V3_ADDR_TYPE_REDIST read

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 dbd9733ab674 ("KVM: arm/arm64: Replace the single rdist region by a list")
Cc <[email protected]> # v4.18+
---
 arch/arm64/kvm/vgic/vgic-kvm-device.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
arch/arm64/kvm/vgic/vgic-kvm-device.c +2 -2
index 44419679f91a..5eaede3e3b5a 100644
@@ -87,8 +87,8 @@ 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,
-					 struct vgic_redist_region, list);
+		rdreg = list_first_entry_or_null(&vgic->rd_regions,
+						 struct vgic_redist_region, list);
 		if (!rdreg)
 			addr_ptr = &undef_value;
 		else
Signature · 1 line
2.26.3
#1 lore raw
Quoted 6 lines · Eric Auger

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.

Indeed, list_first_entry() always return a non-null ptr. If the list is empty, it will mistake the list head as the first element.

Quoted 27 lines

Instead we should use list_first_entry_or_null which effectively returns NULL if the list is empty.

Fixes dbd9733ab674 ("KVM: arm/arm64: Replace the single rdist region by a list")
Cc <[email protected]> # v4.18+
---
 arch/arm64/kvm/vgic/vgic-kvm-device.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
arch/arm64/kvm/vgic/vgic-kvm-device.c +2 -2
index 44419679f91a..5eaede3e3b5a 100644
@@ -87,8 +87,8 @@ 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,
-					 struct vgic_redist_region, list);
+		rdreg = list_first_entry_or_null(&vgic->rd_regions,
+						 struct vgic_redist_region, list);
 		if (!rdreg)
 			addr_ptr = &undef_value;
 		else
maintainer Applied
#2 lore raw
In reply to Eric Auger
Quoted 8 lines · Eric Auger

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.

Applied to kvm-arm64/vgic-5.13, thanks!

[1/1] KVM: arm/arm64: Fix KVM_VGIC_V3_ADDR_TYPE_REDIST read

      commit: 94ac0835391efc1a30feda6fc908913ec012951e

Cheers,

	M.
Signature · 1 line
Without deviation from the norm, progress is not possible.