Commit 4ce64358 authored by Lukas Wunner's avatar Lukas Wunner Committed by Bjorn Helgaas

PCI: hotplug: Don't leak pci_slot on registration failure

If addition of sysfs files fails on registration of a hotplug slot, the
struct pci_slot as well as the entry in the slot_list is leaked.  The
issue has been present since the hotplug core was introduced in 2002:
https://git.kernel.org/tglx/history/c/a8a2069f432c

Perhaps the idea was that even though sysfs addition fails, the slot
should still be usable.  But that's not how drivers use the interface,
they abort probe if a non-zero value is returned.
Signed-off-by: default avatarLukas Wunner <lukas@wunner.de>
Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
Cc: stable@vger.kernel.org # v2.4.15+
Cc: Greg Kroah-Hartman <greg@kroah.com>
parent b4efce5c
...@@ -438,8 +438,17 @@ int __pci_hp_register(struct hotplug_slot *slot, struct pci_bus *bus, ...@@ -438,8 +438,17 @@ int __pci_hp_register(struct hotplug_slot *slot, struct pci_bus *bus,
list_add(&slot->slot_list, &pci_hotplug_slot_list); list_add(&slot->slot_list, &pci_hotplug_slot_list);
result = fs_add_slot(pci_slot); result = fs_add_slot(pci_slot);
if (result)
goto err_list_del;
kobject_uevent(&pci_slot->kobj, KOBJ_ADD); kobject_uevent(&pci_slot->kobj, KOBJ_ADD);
dbg("Added slot %s to the list\n", name); dbg("Added slot %s to the list\n", name);
goto out;
err_list_del:
list_del(&slot->slot_list);
pci_slot->hotplug = NULL;
pci_destroy_slot(pci_slot);
out: out:
mutex_unlock(&pci_hp_mutex); mutex_unlock(&pci_hp_mutex);
return result; return result;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment