Skip to content

Commit

Permalink
PCI/AER: Work around use-after-free in pcie_do_fatal_recovery()
Browse files Browse the repository at this point in the history
When an fatal error is received by a non-bridge device, the device is
removed, and pci_stop_and_remove_bus_device() deallocates the device
structure.  The freed device structure is used by subsequent code to send
uevents and print messages.

Hold a reference on the device until we're finished using it.  This is not
an ideal fix because pcie_do_fatal_recovery() should not use the device at
all after removing it, but that's too big a project for right now.

Fixes: 7e9084b ("PCI/AER: Handle ERR_FATAL with removal and re-enumeration of devices")
Signed-off-by: Thomas Tai <[email protected]>
[bhelgaas: changelog, reduce get/put coverage]
Signed-off-by: Bjorn Helgaas <[email protected]>
  • Loading branch information
thomastaioracle authored and Bjorn Helgaas committed Jul 26, 2018
1 parent 270ed73 commit bd91b56
Showing 1 changed file with 2 additions and 0 deletions.
2 changes: 2 additions & 0 deletions drivers/pci/pcie/err.c
Original file line number Diff line number Diff line change
Expand Up @@ -295,6 +295,7 @@ void pcie_do_fatal_recovery(struct pci_dev *dev, u32 service)

parent = udev->subordinate;
pci_lock_rescan_remove();
pci_dev_get(dev);
list_for_each_entry_safe_reverse(pdev, temp, &parent->devices,
bus_list) {
pci_dev_get(pdev);
Expand Down Expand Up @@ -328,6 +329,7 @@ void pcie_do_fatal_recovery(struct pci_dev *dev, u32 service)
pci_info(dev, "Device recovery from fatal error failed\n");
}

pci_dev_put(dev);
pci_unlock_rescan_remove();
}

Expand Down

0 comments on commit bd91b56

Please sign in to comment.