]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
PCI: iproc: Protect root bus removal with rescan lock
authorHans Zhang <18255117159@163.com>
Thu, 21 May 2026 16:18:18 +0000 (00:18 +0800)
committerBjorn Helgaas <bhelgaas@google.com>
Thu, 18 Jun 2026 16:50:55 +0000 (11:50 -0500)
Hold the pci_rescan_remove_lock lock while stopping and removing a root bus
to avoid racing with concurrent rescan or hotplug operations triggered via
sysfs.  Such races may lead to use-after-free issues or system crashes.

Signed-off-by: Hans Zhang <18255117159@163.com>
Signed-off-by: Manivannan Sadhasivam <mani@kernel.org>
[bhelgaas: commit log]
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Link: https://patch.msgid.link/20260521161822.132996-6-18255117159@163.com
drivers/pci/controller/pcie-iproc.c

index ccf71993ea3595e0f41835c3f8c1ef408b6e7470..c8f0a87cf28a757f72144ece93d624823b173b7b 100644 (file)
@@ -1529,8 +1529,10 @@ void iproc_pcie_remove(struct iproc_pcie *pcie)
 {
        struct pci_host_bridge *host = pci_host_bridge_from_priv(pcie);
 
+       pci_lock_rescan_remove();
        pci_stop_root_bus(host->bus);
        pci_remove_root_bus(host->bus);
+       pci_unlock_rescan_remove();
 
        iproc_pcie_msi_disable(pcie);