KVM: arm/arm64: Fix KVM_VGIC_V3_ADDR_TYPE_REDIST read
Subsystems (2)
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.
--- virt/kvm/arm/vgic/vgic-kvm-device.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
virt/kvm/arm/vgic/vgic-kvm-device.c +2 -2
@@ -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
Quoted 15 lines · Eric Auger
When reading the base address of the a REDIST region through
KVM_VGIC_V3_ADDR_TYPE_REDISTwe 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 uselist_first_entry_or_nullwhich effectively returns NULL if the list is empty.Fixes dbd9733ab674 ("KVM: arm/arm64: Replace the single rdist region by a list")Cc <[email protected]> # v5.4Signed-off-by Eric Auger <[email protected]>Reported-by Gavin Shan <[email protected]>Signed-off-by Marc Zyngier <[email protected]>
Quoted 3 lines
--- virt/kvm/arm/vgic/vgic-kvm-device.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
Both now queued up, thanks.
Next time, give us a hint as to what the upstream commit id is, so that we do not have to dig it up ourselves :)
thanks,
greg k-h
Hi Greg,
Quoted 19 lines · Greg KH
Quoted 15 lines · Eric Auger
When reading the base address of the a REDIST region through
KVM_VGIC_V3_ADDR_TYPE_REDISTwe 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 uselist_first_entry_or_nullwhich effectively returns NULL if the list is empty.Fixes dbd9733ab674 ("KVM: arm/arm64: Replace the single rdist region by a list")Cc <[email protected]> # v5.4Signed-off-by Eric Auger <[email protected]>Reported-by Gavin Shan <[email protected]>Signed-off-by Marc Zyngier <[email protected]>Quoted 3 lines
--- virt/kvm/arm/vgic/vgic-kvm-device.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
Quoted 4 lines
Both now queued up, thanks.
Next time, give us a hint as to what the upstream commit id is, so that we do not have to dig it up ourselves :)
Sure I will.
Thanks!
Eric
Quoted 5 lines
thanks,
greg k-h