Messages in this thread Patch in this message | | | Date | Thu, 1 Jul 2004 18:16:05 -0500 | From | linas@austin ... | Subject | [PATCH] 2.6 PCI Hotplug null pointer deref |
| |
Greg,
Please review the attached patch and, if acceptable, apply to the akpm/otrvalds/bkbits kernel tree.
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.
--linas
Signed-off-by: Linas Vepstas <linas@linas.org>
===== drivers/pci/hotplug/rpaphp_pci.c 1.8 vs edited ===== --- 1.8/drivers/pci/hotplug/rpaphp_pci.c Tue Jun 8 17:53:59 2004 +++ edited/drivers/pci/hotplug/rpaphp_pci.c Thu Jul 1 18:03:57 2004 @@ -378,8 +378,8 @@ 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 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) - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
| |