Commit 8806b945 authored by Alex Williamson's avatar Alex Williamson Committed by Liu Mingrui
Browse files

vfio/platform: Disable virqfds on cleanup 

stable inclusion
from stable-v5.10.215
commit ad68ce4936165cfd8b41f020cbd5b63799d8d336
category: bugfix
bugzilla: https://gitee.com/src-openeuler/kernel/issues/I9E6TQ
CVE: CVE-2024-26813

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



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

[ Upstream commit fcdc0d3d40bc26c105acf8467f7d9018970944ae ]

irqfds for mask and unmask that are not specifically disabled by the
user are leaked.  Remove any irqfds during cleanup

Cc: Eric Auger <eric.auger@redhat.com>
Cc:  <stable@vger.kernel.org>
Fixes: a7fa7c77 ("vfio/platform: implement IRQ masking/unmasking via an eventfd")
Reviewed-by: default avatarKevin Tian <kevin.tian@intel.com>
Reviewed-by: default avatarEric Auger <eric.auger@redhat.com>
Link: https://lore.kernel.org/r/20240308230557.805580-6-alex.williamson@redhat.com


Signed-off-by: default avatarAlex Williamson <alex.williamson@redhat.com>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
Signed-off-by: default avatarLiu Mingrui <liumingrui@huawei.com>
parent b05f2de3

drivers/vfio/platform/vfio_platform_irq.c

+4 −1
Original line number Diff line number Diff line
@@ -321,8 +321,11 @@ void vfio_platform_irq_cleanup(struct vfio_platform_device *vdev) 
{

	int i;



	for (i = 0; i < vdev->num_irqs; i++)

	for (i = 0; i < vdev->num_irqs; i++) {

		vfio_virqfd_disable(&vdev->irqs[i].mask);

		vfio_virqfd_disable(&vdev->irqs[i].unmask);

		vfio_set_trigger(vdev, i, -1, NULL);

	}



	vdev->num_irqs = 0;

	kfree(vdev->irqs);