Commit 1d52fdc0 authored by Linas Vepstas's avatar Linas Vepstas Committed by Greg Kroah-Hartman

[PATCH] PCI Hotplug: rpaphp null pointer deref

This patch fixes a null-pointer dereference when hot-plug operations
are performed on a machine that has virtual-io devices in it.
Virtual i/o devices to not have pci bridges associated with them.
It also corrects an ordering problem during hotplug remove.

This patch was previously reviewed/tested by Linda Xie, the current
rpaphp maintainer.
Signed-off-by: default avatarLinas Vepstas <linas@linas.org>
Signed-off-by: default avatarGreg Kroah-Hartman <greg@kroah.com>
parent ab4038ad
......@@ -378,8 +378,8 @@ int rpaphp_unconfig_pci_adapter(struct slot *slot)
func = list_entry(ln, struct rpaphp_pci_func, sibling);
if (func->pci_dev) {
rpaphp_eeh_remove_bus_device(func->pci_dev);
pci_remove_bus_device(func->pci_dev);
rpaphp_eeh_remove_bus_device(func->pci_dev);
}
kfree(func);
}
......@@ -513,9 +513,18 @@ struct hotplug_slot *rpaphp_find_hotplug_slot(struct pci_dev *dev)
struct list_head *ln;
slot = list_entry(tmp, struct slot, rpaphp_slot_list);
if (slot->bridge == NULL) {
if (slot->dev_type == PCI_DEV) {
printk(KERN_WARNING "PCI slot missing bridge %s %s \n",
slot->name, slot->location);
}
continue;
}
bus = slot->bridge->subordinate;
if (!bus)
return NULL; /* shouldn't be here */
if (!bus) {
continue; /* should never happen? */
}
for (ln = bus->devices.next; ln != &bus->devices; ln = ln->next) {
struct pci_dev *pdev = pci_dev_b(ln);
if (pdev == dev)
......
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