intel_bios_dumper: handle rom_size == 0
authorForest Bond <forest@alittletooquiet.net>
Tue, 22 Mar 2011 14:31:43 +0000 (10:31 -0400)
committerChris Wilson <chris@chris-wilson.co.uk>
Tue, 22 Mar 2011 14:44:25 +0000 (14:44 +0000)
Some versions of libpciaccess on Linux set rom_size to 0 for VGA
devices.  While this behavior may change, intel_bios_dumper should
handle this situation to be compatible with current versions of the
library.

This fixes segmentation faults on affected systems.

Signed-off-by: Forest Bond <forest.bond@rapidrollout.com>
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
tools/intel_bios_dumper.c

index 53293eb..0fa1833 100644 (file)
@@ -77,6 +77,11 @@ int main(int argc, char **argv)
        if (dev->vendor_id != 0x8086)
                errx(1, "Graphics card is non-intel");
 
+       /* Some versions of libpciaccess correct this automatically, but some
+        * don't. */
+       if (dev->rom_size == 0)
+               dev->rom_size = 64 * 1024;
+
        bios = malloc(dev->rom_size);
        if (bios == NULL)
                errx(1, "Couldn't allocate memory for BIOS data\n");