david/ipxe
david
/
ipxe
Archived
1
0
Fork 0
Code

[util] Use PCI length field to obtain length of individual images 

Option::ROM currently uses the initialisation length field (single
byte at offset 0x02) to determine the length of a ROM image within a
multi-image ROM file.  For PCI ROM images with a code type other than
0, the initialisation length field may not be present.

Fix by using the PCI header's image length field instead.  Note that
this does not prevent us from correctly handling ISA ROMs, since ISA
ROMs do not support multiple images within a single ROM BAR anyway.

Inspired-by: Swift Geek <swiftgeek@gmail.com>
Signed-off-by: Michael Brown <mcb30@ipxe.org>
This commit is contained in:
Michael Brown 2014-08-26 11:42:42 +01:00
parent 8b64cc7fba
commit ee0c24902a
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/util/Option/ROM.pm
View File

@ -266,11 +266,10 @@ sub set {
# Split out any data belonging to the next image
delete $self->{next_image};
my $length = ( $hash->{length} * 512 );
my $pci_header = $hash->pci_header();
if ( ( $length < length $data ) &&
( defined $pci_header ) &&
if ( ( defined $pci_header ) &&
( ! ( $pci_header->{last_image} & PCI_LAST_IMAGE ) ) ) {
my $length = ( $pci_header->{image_length} * 512 );
my $remainder = substr ( $data, $length );
$data = substr ( $data, 0, $length );
$self->{next_image} = new Option::ROM;