openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

PCI: Fix refcount issue in pci_create_root_bus() error recovery path 

After calling device_register(&bridge->dev), the bridge is reference-
counted, and it is illegal to call kfree() on it except in the release
function.

[bhelgaas: changelog, use put_device() after device_register() failure]
Signed-off-by: Jiang Liu <jiang.liu@huawei.com>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Cc: stable@vger.kernel.org
This commit is contained in:
Jiang Liu 2013-06-07 01:10:08 +08:00 committed by Bjorn Helgaas
parent a649dbfea3
commit 343df771e6
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
drivers/pci/probe.c
View File

@ -1711,12 +1711,16 @@ struct pci_bus *pci_create_root_bus(struct device *parent, int bus,
bridge->dev.release = pci_release_bus_bridge_dev; bridge->dev.release = pci_release_bus_bridge_dev;
dev_set_name(&bridge->dev, "pci%04x:%02x", pci_domain_nr(b), bus); dev_set_name(&bridge->dev, "pci%04x:%02x", pci_domain_nr(b), bus);
error = pcibios_root_bridge_prepare(bridge); error = pcibios_root_bridge_prepare(bridge);
if (error) if (error) {
goto bridge_dev_reg_err; kfree(bridge);
goto err_out;
}
error = device_register(&bridge->dev); error = device_register(&bridge->dev);
if (error) if (error) {
goto bridge_dev_reg_err; put_device(&bridge->dev);
goto err_out;
}
b->bridge = get_device(&bridge->dev); b->bridge = get_device(&bridge->dev);
device_enable_async_suspend(b->bridge); device_enable_async_suspend(b->bridge);
pci_set_bus_of_node(b); pci_set_bus_of_node(b);
@ -1772,8 +1776,6 @@ struct pci_bus *pci_create_root_bus(struct device *parent, int bus,
class_dev_reg_err: class_dev_reg_err:
put_device(&bridge->dev); put_device(&bridge->dev);
device_unregister(&bridge->dev); device_unregister(&bridge->dev);
bridge_dev_reg_err:
kfree(bridge);
err_out: err_out:
kfree(b); kfree(b);
return NULL; return NULL;