Commit 0af2795f authored by Marc Zyngier's avatar Marc Zyngier Committed by Thomas Gleixner
Browse files

genirq/msi: Take the per-device MSI lock before validating the control structure 



Calling msi_ctrl_valid() ultimately results in calling
msi_get_device_domain(), which requires holding the device MSI lock.

However, in msi_domain_populate_irqs() the lock is taken right after having
called msi_ctrl_valid(), which is just a tad too late.

Take the lock before invoking msi_ctrl_valid().

Fixes: 40742716 ("genirq/msi: Make msi_add_simple_msi_descs() device domain aware")
Reported-by: default avatar"Russell King (Oracle)" <linux@armlinux.org.uk>
Signed-off-by: default avatarMarc Zyngier <maz@kernel.org>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Tested-by: default avatarRussell King (Oracle) <rmk+kernel@armlinux.org.uk>
Cc: stable@vger.kernel.org
Link: https://lore.kernel.org/r/Y/Opu6ETe3ZzZ/8E@shell.armlinux.org.uk
Link: https://lore.kernel.org/r/20230220190101.314446-1-maz@kernel.org
parent feabecaf

kernel/irq/msi.c

+6 −3
Original line number Diff line number Diff line
@@ -1084,10 +1084,13 @@ int msi_domain_populate_irqs(struct irq_domain *domain, struct device *dev, 
	struct xarray *xa;

	int ret, virq;



	if (!msi_ctrl_valid(dev, &ctrl))

		return -EINVAL;



	msi_lock_descs(dev);



	if (!msi_ctrl_valid(dev, &ctrl)) {

		ret = -EINVAL;

		goto unlock;

	}



	ret = msi_domain_add_simple_msi_descs(dev, &ctrl);

	if (ret)

		goto unlock;