Skip to content

Commit ad362fe

Browse files
ouptonMarc Zyngier
authored andcommitted
KVM: arm64: vgic-its: Avoid potential UAF in LPI translation cache
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: [email protected] Signed-off-by: Oliver Upton <[email protected]> Signed-off-by: Marc Zyngier <[email protected]> Link: https://lore.kernel.org/r/[email protected]
1 parent 39084ba commit ad362fe

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
@@ -590,7 +590,11 @@ static struct vgic_irq *vgic_its_check_cache(struct kvm *kvm, phys_addr_t db,
590590
unsigned long flags;
591591

592592
raw_spin_lock_irqsave(&dist->lpi_list_lock, flags);
593+
593594
irq = __vgic_its_check_cache(dist, db, devid, eventid);
595+
if (irq)
596+
vgic_get_irq_kref(irq);
597+
594598
raw_spin_unlock_irqrestore(&dist->lpi_list_lock, flags);
595599

596600
return irq;
@@ -769,6 +773,7 @@ int vgic_its_inject_cached_translation(struct kvm *kvm, struct kvm_msi *msi)
769773
raw_spin_lock_irqsave(&irq->irq_lock, flags);
770774
irq->pending_latch = true;
771775
vgic_queue_irq_unlock(kvm, irq, flags);
776+
vgic_put_irq(kvm, irq);
772777

773778
return 0;
774779
}

0 commit comments

Comments
 (0)