[v2] PCI: fix missing ROM content warning in pci_get_rom_size()

Commit Message

Bjorn Helgaas Dec. 4, 2015, 11:44 p.m. UTC

On Fri, Nov 27, 2015 at 06:20:06PM +0100, Vladis Dronov wrote:
> Make pci_get_rom_size() to emit a warning if any byte in a PCI ROM
> header or data signature is not following the standard ("PCI Local
> Bus Specification" or "PCI Firmware Specification Revision 3.x"),
> not only the first one.
> 
> Signed-off-by: Vladis Dronov <[e-mail]>

Applied as follows to pci/misc for v4.5, thanks!


commit f3744cad60c3ecae125c4be566867517d4bac848
Author: Vladis Dronov <[e-mail]>
Date:   Fri Nov 27 18:20:06 2015 +0100

    PCI: Print warnings for all invalid expansion ROM headers
    
    We've always validated that both bytes of the Expansion ROM signature and
    all four bytes of the PCI Data Structure signature (see PCI Firmware spec
    r3.0, sec 5.1.1), but we only printed a warning if the first byte of the
    ROM signature was invalid.
    
    Print warnings if *any* of those bytes are invalid.  Note that we only look
    at these headers if we map or read the ROM.
    
    [bhelgaas: changelog, tweak printk format]
    Signed-off-by: Vladis Dronov <[e-mail]>
    Signed-off-by: Bjorn Helgaas <[e-mail]>

--
To unsubscribe from this list: send the line "unsubscribe linux-pci" in
the body of a message to [e-mail]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch

diff --git a/drivers/pci/rom.c b/drivers/pci/rom.c
index eb0ad53..5a1a39d 100644
--- a/drivers/pci/rom.c
+++ b/drivers/pci/rom.c
@@ -77,22 +77,18 @@  size_t pci_get_rom_size(struct pci_dev *pdev, void __iomem *rom, size_t size)
 	do {
 		void __iomem *pds;
 		/* Standard PCI ROMs start out with these bytes 55 AA */
-		if (readb(image) != 0x55) {
-			dev_err(&pdev->dev, "Invalid ROM contents\n");
+		if (readw(image) != 0xAA55) {
+			dev_err(&pdev->dev, "Invalid PCI ROM header signature: expecting 0xaa55, got %#06x\n",
+				readw(image));
 			break;
 		}
-		if (readb(image + 1) != 0xAA)
-			break;
-		/* get the PCI data structure and check its signature */
+		/* get the PCI data structure and check its "PCIR" signature */
 		pds = image + readw(image + 24);
-		if (readb(pds) != 'P')
-			break;
-		if (readb(pds + 1) != 'C')
-			break;
-		if (readb(pds + 2) != 'I')
-			break;
-		if (readb(pds + 3) != 'R')
+		if (readl(pds) != 0x52494350) {
+			dev_err(&pdev->dev, "Invalid PCI ROM data signature: expecting 0x52494350, got %#010x\n",
+				readl(pds));
 			break;
+		}
 		last_image = readb(pds + 21) & 0x80;
 		length = readw(pds + 16);
 		image += length * 512;