Commit 1a8251a1 authored by Oliver Upton's avatar Oliver Upton Committed by Ma Wupeng
Browse files

KVM: arm64: vgic-its: Avoid potential UAF in LPI translation cache 

stable inclusion
from stable-v6.6.14
commit 65b201bf3e9af1b0254243a5881390eda56f72d1
bugzilla: https://gitee.com/openeuler/kernel/issues/I99TJK

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=65b201bf3e9af1b0254243a5881390eda56f72d1



--------------------------------

commit ad362fe07fecf0aba839ff2cc59a3617bd42c33f upstream.

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: default avatarOliver Upton <oliver.upton@linux.dev>
Signed-off-by: default avatarMarc Zyngier <maz@kernel.org>
Link: https://lore.kernel.org/r/20240104183233.3560639-1-oliver.upton@linux.dev


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarZhangPeng <zhangpeng362@huawei.com>
parent 4d29de5a

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

+5 −0
Original line number Diff line number Diff line
@@ -642,7 +642,11 @@ static struct vgic_irq *vgic_its_check_cache(struct kvm *kvm, phys_addr_t db, 
	raw_spin_unlock_irqrestore(&dist->lpi_translation_cache[cacheid].lpi_cache_lock, flags);

#else

	raw_spin_lock_irqsave(&dist->lpi_list_lock, flags);



	irq = __vgic_its_check_cache(dist, db, devid, eventid);

	if (irq)

		vgic_get_irq_kref(irq);



	raw_spin_unlock_irqrestore(&dist->lpi_list_lock, flags);

#endif
@@ -900,6 +904,7 @@ int vgic_its_inject_cached_translation(struct kvm *kvm, struct kvm_msi *msi) 
	raw_spin_lock_irqsave(&irq->irq_lock, flags);

	irq->pending_latch = true;

	vgic_queue_irq_unlock(kvm, irq, flags);

	vgic_put_irq(kvm, irq);



	return 0;

}