PCI: host-common: Fix driver remove NULL bridge->bus dereference
Rob Herring
reviewerPATCH 1/1 PCI: host-common: Fix driver remove NULL bridge->bus dereference
Commit 2d716c37b5ce ("PCI: host-common: Use struct pci_host_bridge.windows list directly") moved platform_set_drvdata() before pci_host_probe() which results in the bridge->bus pointer being NULL. Let's change the drvdata to the bridge struct instead to fix this.
--- drivers/pci/controller/pci-host-common.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/pci/controller/pci-host-common.c +4 -4
@@ -83,7 +83,7 @@ int pci_host_common_probe(struct platform_device *pdev) bridge->map_irq = of_irq_parse_and_map_pci; bridge->swizzle_irq = pci_common_swizzle; -platform_set_drvdata (pdev, bridge->bus); +platform_set_drvdata (pdev, bridge);return pci_host_probe (bridge); }
@@ -91,11 +91,11 @@ EXPORT_SYMBOL_GPL(pci_host_common_probe);int pci_host_common_remove (struct platform_device *pdev) { -struct pci_bus *bus =platform_get_drvdata (pdev); +struct pci_host_bridge *bridge =platform_get_drvdata (pdev);pci_lock_rescan_remove (); -pci_stop_root_bus (bus); -pci_remove_root_bus (bus); +pci_stop_root_bus (bridge->bus); +pci_remove_root_bus (bridge->bus);pci_unlock_rescan_remove ();return 0 ;
Signature · 1 line
2.25.1
Quoted 6 lines · Rob Herring
Commit
2d716c37b5ce("PCI: host-common: Use struct pci_host_bridge.windows list directly") movedplatform_set_drvdata()beforepci_host_probe()which results in thebridge->buspointer being NULL. Let's change the drvdata to the bridge struct instead to fix this.
Quoted 6 lines
Fixes 2d716c37b5ce ("PCI: host-common: Use struct pci_host_bridge.windows list directly")Reported-by Anders Roxell <[email protected]>Cc Will Deacon <[email protected]>Cc Lorenzo Pieralisi <[email protected]>Cc Bjorn Helgaas <[email protected]>Signed-off-by Rob Herring <[email protected]>
Thank you for the quick fix.
Cheers,
Anders
Quoted 35 lines
--- drivers/pci/controller/pci-host-common.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)drivers/pci/controller/pci-host-common.c +4
-5@@ -83,7 +83,7 @@ int pci_host_common_probe(struct platform_device *pdev) bridge->map_irq = of_irq_parse_and_map_pci; bridge->swizzle_irq = pci_common_swizzle; -platform_set_drvdata (pdev, bridge->bus); +platform_set_drvdata (pdev, bridge);return pci_host_probe (bridge); }@@ -91,11 +91,11 @@ EXPORT_SYMBOL_GPL(pci_host_common_probe);int pci_host_common_remove (struct platform_device *pdev) { -struct pci_bus *bus =platform_get_drvdata (pdev); +struct pci_host_bridge *bridge =platform_get_drvdata (pdev);pci_lock_rescan_remove (); -pci_stop_root_bus (bus); -pci_remove_root_bus (bus); +pci_stop_root_bus (bridge->bus); +pci_remove_root_bus (bridge->bus);pci_unlock_rescan_remove ();return 0 ; --2.25.1
Quoted 6 lines · Rob Herring
Commit
2d716c37b5ce("PCI: host-common: Use struct pci_host_bridge.windows list directly") movedplatform_set_drvdata()beforepci_host_probe()which results in thebridge->buspointer being NULL. Let's change the drvdata to the bridge struct instead to fix this.Fixes 2d716c37b5ce ("PCI: host-common: Use struct pci_host_bridge.windows list directly")
This commit is in -next, but not Linus's tree. Hopefully Lorenzo can just squash this fix into it.
Quoted 10 lines · Bjorn Helgaas
Quoted 6 lines · Rob Herring
Commit
2d716c37b5ce("PCI: host-common: Use struct pci_host_bridge.windows list directly") movedplatform_set_drvdata()beforepci_host_probe()which results in thebridge->buspointer being NULL. Let's change the drvdata to the bridge struct instead to fix this.Fixes 2d716c37b5ce ("PCI: host-common: Use struct pci_host_bridge.windows list directly")This commit is in -next, but not Linus's tree. Hopefully Lorenzo can just squash this fix into it.
Done, updated my pci/misc branch accordingly.
Lorenzo