Skip to content

Commit 8f4908c

Browse files
committed
KVM: arm64: vgic-its: Avoid potential UAF in LPI translation cache
jira VULN-42535 cve CVE-2024-26598 commit-author Oliver Upton <oliver.upton@linux.dev> commit ad362fe There is a potential UAF scenario in the case of an LPI translation cache hit racing with an operation that invalidates the cache, such as a DISCARD ITS command. The root of the problem is that vgic_its_check_cache() does not elevate the refcount on the vgic_irq before dropping the lock that serializes refcount changes. Have vgic_its_check_cache() raise the refcount on the returned vgic_irq and add the corresponding decrement after queueing the interrupt. Cc: stable@vger.kernel.org Signed-off-by: Oliver Upton <oliver.upton@linux.dev> Signed-off-by: Marc Zyngier <maz@kernel.org> Link: https://lore.kernel.org/r/20240104183233.3560639-1-oliver.upton@linux.dev (cherry picked from commit ad362fe) Signed-off-by: Jonathan Maple <jmaple@ciq.com>
1 parent 372a029 commit 8f4908c

File tree

1 file changed

+5
-0
lines changed

1 file changed

+5
-0
lines changed

arch/arm64/kvm/vgic/vgic-its.c

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -595,7 +595,11 @@ static struct vgic_irq *vgic_its_check_cache(struct kvm *kvm, phys_addr_t db,
595595
unsigned long flags;
596596

597597
raw_spin_lock_irqsave(&dist->lpi_list_lock, flags);
598+
598599
irq = __vgic_its_check_cache(dist, db, devid, eventid);
600+
if (irq)
601+
vgic_get_irq_kref(irq);
602+
599603
raw_spin_unlock_irqrestore(&dist->lpi_list_lock, flags);
600604

601605
return irq;
@@ -774,6 +778,7 @@ int vgic_its_inject_cached_translation(struct kvm *kvm, struct kvm_msi *msi)
774778
raw_spin_lock_irqsave(&irq->irq_lock, flags);
775779
irq->pending_latch = true;
776780
vgic_queue_irq_unlock(kvm, irq, flags);
781+
vgic_put_irq(kvm, irq);
777782

778783
return 0;
779784
}

0 commit comments

Comments
 (0)