diff options
| author | Marc Zyngier <maz@kernel.org> | 2023-02-20 19:01:01 +0000 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2023-03-10 09:29:48 +0100 |
| commit | a354667993183b54430a34937bd3718380c63780 (patch) | |
| tree | 42dd716f4c4ee0b35932f6a38b4143de64b00aa0 /kernel | |
| parent | e0b0354738f4cced09c0fb6a30021c5400390701 (diff) | |
| download | linux-a354667993183b54430a34937bd3718380c63780.tar.gz linux-a354667993183b54430a34937bd3718380c63780.tar.bz2 linux-a354667993183b54430a34937bd3718380c63780.zip | |
genirq/msi: Take the per-device MSI lock before validating the control structure
commit 0af2795f936f1ea1f9f1497447145dfcc7ed2823 upstream.
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: 40742716f294 ("genirq/msi: Make msi_add_simple_msi_descs() device domain aware")
Reported-by: "Russell King (Oracle)" <linux@armlinux.org.uk>
Signed-off-by: Marc Zyngier <maz@kernel.org>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Tested-by: Russell 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
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/irq/msi.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/kernel/irq/msi.c b/kernel/irq/msi.c index 1f25d4594b5d..a020bc97021f 100644 --- a/kernel/irq/msi.c +++ b/kernel/irq/msi.c @@ -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; |