Skip to content

Commit cf9c2bc

Browse files
l1kgregkh
authored andcommitted
PCI: hotplug: Don't leak pci_slot on registration failure
commit 4ce6435 upstream. 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: Lukas Wunner <lukas@wunner.de> Signed-off-by: Bjorn Helgaas <bhelgaas@google.com> Cc: stable@vger.kernel.org # v2.4.15+ Cc: Greg Kroah-Hartman <greg@kroah.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent 6541d98 commit cf9c2bc

1 file changed

Lines changed: 9 additions & 0 deletions

File tree

drivers/pci/hotplug/pci_hotplug_core.c

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -452,8 +452,17 @@ int __pci_hp_register(struct hotplug_slot *slot, struct pci_bus *bus,
452452
list_add(&slot->slot_list, &pci_hotplug_slot_list);
453453

454454
result = fs_add_slot(pci_slot);
455+
if (result)
456+
goto err_list_del;
457+
455458
kobject_uevent(&pci_slot->kobj, KOBJ_ADD);
456459
dbg("Added slot %s to the list\n", name);
460+
goto out;
461+
462+
err_list_del:
463+
list_del(&slot->slot_list);
464+
pci_slot->hotplug = NULL;
465+
pci_destroy_slot(pci_slot);
457466
out:
458467
mutex_unlock(&pci_hp_mutex);
459468
return result;

0 commit comments

Comments
 (0)