narenas
/
opengnsys_ipxe
mirror of https://github.com/ipxe/ipxe.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[block] Quell spurious Coverity size mismatch warning 

Signed-off-by: Michael Brown <mcb30@ipxe.org>
pull/58/merge
Michael Brown 2017-03-22 11:45:28 +02:00
parent c26c1fd07c
commit e846bd22c3
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/core/sanboot.c
View File

@ -466,7 +466,10 @@ static int sandev_parse_iso9660 ( struct san_device *sandev ) {
.type = ISO9660_TYPE_PRIMARY, .type = ISO9660_TYPE_PRIMARY,
.id = ISO9660_ID, .id = ISO9660_ID,
}; };
struct iso9660_primary_descriptor *primary; union {
struct iso9660_primary_descriptor primary;
char bytes[ISO9660_BLKSIZE];
} *scratch;
unsigned int blksize; unsigned int blksize;
unsigned int blksize_shift; unsigned int blksize_shift;
unsigned int lba; unsigned int lba;
@ -489,14 +492,14 @@ static int sandev_parse_iso9660 ( struct san_device *sandev ) {
count = ( 1 << blksize_shift ); count = ( 1 << blksize_shift );
/* Allocate scratch area */ /* Allocate scratch area */
primary = malloc ( ISO9660_BLKSIZE ); scratch = malloc ( ISO9660_BLKSIZE );
if ( ! primary ) { if ( ! scratch ) {
rc = -ENOMEM; rc = -ENOMEM;
goto err_alloc; goto err_alloc;
} }
/* Read primary volume descriptor */ /* Read primary volume descriptor */
if ( ( rc = sandev_rw ( sandev, lba, count, virt_to_user ( primary ), if ( ( rc = sandev_rw ( sandev, lba, count, virt_to_user ( scratch ),
block_read ) ) != 0 ) { block_read ) ) != 0 ) {
DBGC ( sandev, "SAN %#02x could not read ISO9660 primary" DBGC ( sandev, "SAN %#02x could not read ISO9660 primary"
"volume descriptor: %s\n", "volume descriptor: %s\n",
@ -505,7 +508,8 @@ static int sandev_parse_iso9660 ( struct san_device *sandev ) {
} }
/* Configure as CD-ROM if applicable */ /* Configure as CD-ROM if applicable */
if ( memcmp ( primary, &primary_check, sizeof ( primary_check ) ) == 0){ if ( memcmp ( &scratch->primary.fixed, &primary_check,
sizeof ( primary_check ) ) == 0 ) {
DBGC ( sandev, "SAN %#02x contains an ISO9660 filesystem; " DBGC ( sandev, "SAN %#02x contains an ISO9660 filesystem; "
"treating as CD-ROM\n", sandev->drive ); "treating as CD-ROM\n", sandev->drive );
sandev->blksize_shift = blksize_shift; sandev->blksize_shift = blksize_shift;
@ -513,7 +517,7 @@ static int sandev_parse_iso9660 ( struct san_device *sandev ) {
} }
err_rw: err_rw:
free ( primary ); free ( scratch );
err_alloc: err_alloc:
invalid_blksize: invalid_blksize:
return rc; return rc;