diff options
| author | Alexei Starovoitov <ast@plumgrid.com> | 2014-06-04 15:49:50 -0700 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2014-06-11 11:13:19 -0600 |
| commit | b701c0b1fe819a2083fc6ec5332e0e4492b9516d (patch) | |
| tree | 1c42a0508a55e736faa6a7e04731a674caa02099 /drivers/pci | |
| parent | 843a85ced99b9c8f8221f11d5cbcc56c2dae2842 (diff) | |
| download | op-kernel-dev-b701c0b1fe819a2083fc6ec5332e0e4492b9516d.zip op-kernel-dev-b701c0b1fe819a2083fc6ec5332e0e4492b9516d.tar.gz | |
PCI/MSI: Fix memory leak in free_msi_irqs()
free_msi_irqs() is leaking memory, since list_for_each_entry(entry,
&dev->msi_list, list) {...} is never executed, because dev->msi_list is
made empty by the loop just above this one.
Fix it by relying on zero termination of attribute array like
populate_msi_sysfs() does.
Fixes: 1c51b50c2995 ("PCI/MSI: Export MSI mode using attributes, not kobjects")
Signed-off-by: Alexei Starovoitov <ast@plumgrid.com>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Acked-by: Neil Horman <nhorman@tuxdriver.com>
Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
CC: stable@vger.kernel.org # v3.14+
Diffstat (limited to 'drivers/pci')
| -rw-r--r-- | drivers/pci/msi.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pci/msi.c b/drivers/pci/msi.c index 27a7e67..229b0d1 100644 --- a/drivers/pci/msi.c +++ b/drivers/pci/msi.c @@ -413,7 +413,7 @@ static void free_msi_irqs(struct pci_dev *dev) if (dev->msi_irq_groups) { sysfs_remove_groups(&dev->dev.kobj, dev->msi_irq_groups); msi_attrs = dev->msi_irq_groups[0]->attrs; - list_for_each_entry(entry, &dev->msi_list, list) { + while (msi_attrs[count]) { dev_attr = container_of(msi_attrs[count], struct device_attribute, attr); kfree(dev_attr->attr.name); |
