diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2021-11-09 14:53:57 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2021-11-21 13:49:08 +0100 |
| commit | f64af173573104dd896a75b1b9116031b35bbb95 (patch) | |
| tree | afea29aa66e57928adc8db26d01fc3c0b83cb61b | |
| parent | f41389affe96f140bb9b81e17f3dc5f002a413a3 (diff) | |
| download | linux-stable-f64af173573104dd896a75b1b9116031b35bbb95.tar.gz linux-stable-f64af173573104dd896a75b1b9116031b35bbb95.tar.bz2 linux-stable-f64af173573104dd896a75b1b9116031b35bbb95.zip | |
PCI/MSI: Destroy sysfs before freeing entries
commit 3735459037114d31e5acd9894fad9aed104231a0 upstream.
free_msi_irqs() frees the MSI entries before destroying the sysfs entries
which are exposing them. Nothing prevents a concurrent free while a sysfs
file is read and accesses the possibly freed entry.
Move the sysfs release ahead of freeing the entries.
Fixes: 1c51b50c2995 ("PCI/MSI: Export MSI mode using attributes, not kobjects")
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Reviewed-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Bjorn Helgaas <helgaas@kernel.org>
Cc: stable@vger.kernel.org
Link: https://lore.kernel.org/r/87sfw5305m.ffs@tglx
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/pci/msi.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/drivers/pci/msi.c b/drivers/pci/msi.c index 3a9f4f8ad8f9..30bec2482e27 100644 --- a/drivers/pci/msi.c +++ b/drivers/pci/msi.c @@ -368,18 +368,6 @@ static void free_msi_irqs(struct pci_dev *dev) for (i = 0; i < entry->nvec_used; i++) BUG_ON(irq_has_action(entry->irq + i)); - pci_msi_teardown_msi_irqs(dev); - - list_for_each_entry_safe(entry, tmp, msi_list, list) { - if (entry->msi_attrib.is_msix) { - if (list_is_last(&entry->list, msi_list)) - iounmap(entry->mask_base); - } - - list_del(&entry->list); - free_msi_entry(entry); - } - if (dev->msi_irq_groups) { sysfs_remove_groups(&dev->dev.kobj, dev->msi_irq_groups); msi_attrs = dev->msi_irq_groups[0]->attrs; @@ -395,6 +383,18 @@ static void free_msi_irqs(struct pci_dev *dev) kfree(dev->msi_irq_groups); dev->msi_irq_groups = NULL; } + + pci_msi_teardown_msi_irqs(dev); + + list_for_each_entry_safe(entry, tmp, msi_list, list) { + if (entry->msi_attrib.is_msix) { + if (list_is_last(&entry->list, msi_list)) + iounmap(entry->mask_base); + } + + list_del(&entry->list); + free_msi_entry(entry); + } } static void pci_intx_for_msi(struct pci_dev *dev, int enable) |