Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1a3d8691 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'pci-v4.18-fixes-4' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci 

Pull PCI fix from Bjorn Helgaas:
 "Fix a use-after-free error in fatal error recovery (Thomas Tai)"

* tag 'pci-v4.18-fixes-4' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci:
  PCI/AER: Work around use-after-free in pcie_do_fatal_recovery()
parents 6284c99c bd91b56c

drivers/pci/pcie/err.c

+2 −0
Original line number Diff line number Diff line
@@ -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);
@@ -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();

}