Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

PCI/AER: Work around use-after-free in pcie_do_fatal_recovery()

Browse source 
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: 7e9084b367 ("PCI/AER: Handle ERR_FATAL with removal and re-enumeration of devices")
Signed-off-by: Thomas Tai <thomas.tai@oracle.com>
[bhelgaas: changelog, reduce get/put coverage]
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
This commit is contained in:
Thomas Tai 2018-07-26 12:13:04 -05:00 committed by Bjorn Helgaas
parent 270ed733e6
commit bd91b56cb3
1 changed files with 2 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
drivers/pci/pcie/err.c
View file

@ -295,6 +295,7 @@ void pcie_do_fatal_recovery(struct pci_dev *dev, u32 service)
parent = udev->subordinate; parent = udev->subordinate;
pci_lock_rescan_remove(); pci_lock_rescan_remove();
pci_dev_get(dev);
list_for_each_entry_safe_reverse(pdev, temp, &parent->devices, list_for_each_entry_safe_reverse(pdev, temp, &parent->devices,
bus_list) { bus_list) {
pci_dev_get(pdev); pci_dev_get(pdev);
@ -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_info(dev, "Device recovery from fatal error failed\n");
} }
pci_dev_put(dev);
pci_unlock_rescan_remove(); pci_unlock_rescan_remove();
} }