diff options
| author | Michel Dänzer <michel.daenzer@amd.com> | 2015-01-19 17:53:20 +0900 |
|---|---|---|
| committer | Ben Hutchings <ben@decadent.org.uk> | 2015-05-09 23:16:13 +0100 |
| commit | f50587eec5cd5e7d78744f54364a14bb6b55adcc (patch) | |
| tree | 7df66e9245a9b62f909a5ae15c813970ab604b48 /drivers/pci | |
| parent | 16a0a3f34da7ba0054fe923156de1da87b933644 (diff) | |
| download | kernel_samsung_smdk4412-f50587eec5cd5e7d78744f54364a14bb6b55adcc.zip kernel_samsung_smdk4412-f50587eec5cd5e7d78744f54364a14bb6b55adcc.tar.gz kernel_samsung_smdk4412-f50587eec5cd5e7d78744f54364a14bb6b55adcc.tar.bz2 | |
PCI: Fix infinite loop with ROM image of size 0
commit 16b036af31e1456cb69243a5a0c9ef801ecd1f17 upstream.
If the image size would ever read as 0, pci_get_rom_size() could keep
processing the same image over and over again. Exit the loop if we ever
read a length of zero.
This fixes a soft lockup on boot when the radeon driver calls
pci_get_rom_size() on an AMD Radeon R7 250X PCIe discrete graphics card.
[bhelgaas: changelog, reference]
Link: https://bugs.launchpad.net/ubuntu/+source/linux/+bug/1386973
Reported-by: Federico <federicotg@gmail.com>
Signed-off-by: Michel Dänzer <michel.daenzer@amd.com>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Diffstat (limited to 'drivers/pci')
| -rw-r--r-- | drivers/pci/rom.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/pci/rom.c b/drivers/pci/rom.c index 48ebdb2..e31659c 100644 --- a/drivers/pci/rom.c +++ b/drivers/pci/rom.c @@ -69,6 +69,7 @@ size_t pci_get_rom_size(struct pci_dev *pdev, void __iomem *rom, size_t size) { void __iomem *image; int last_image; + unsigned length; image = rom; do { @@ -91,9 +92,9 @@ size_t pci_get_rom_size(struct pci_dev *pdev, void __iomem *rom, size_t size) if (readb(pds + 3) != 'R') break; last_image = readb(pds + 21) & 0x80; - /* this length is reliable */ - image += readw(pds + 16) * 512; - } while (!last_image); + length = readw(pds + 16); + image += length * 512; + } while (length && !last_image); /* never return a size larger than the PCI resource window */ /* there are known ROMs that get the size wrong */ |