GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix endless loop when trying to add a too large file to CBFS, 

and report the correct error code, and a hopefully helpful
error message.


Signed-off-by: Patrick Georgi <patrick.georgi@coresystems.de>
Acked-by: Stefan Reinauer <stepan@coresystems.de>


git-svn-id: svn://svn.coreboot.org/coreboot/trunk@4692 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
This commit is contained in:
Patrick Georgi 2009-09-30 11:21:18 +00:00
parent 53ad9f585d
commit 56f5fb734b
2 changed files with 37 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
util/cbfstool/cbfstool.c
View File

@ -80,7 +80,8 @@ static int cbfs_add(int argc, char **argv)
} }
cbfsfile = cbfsfile =
create_cbfs_file(cbfsname, filedata, &filesize, type, &base); create_cbfs_file(cbfsname, filedata, &filesize, type, &base);
add_file_to_cbfs(cbfsfile, filesize, base); if (add_file_to_cbfs(cbfsfile, filesize, base))
return 1;
writerom(romname, rom, romsize); writerom(romname, rom, romsize);
return 0; return 0;
} }
@ -127,7 +128,8 @@ static int cbfs_add_payload(int argc, char **argv)
cbfsfile = cbfsfile =
create_cbfs_file(cbfsname, payload, &filesize, create_cbfs_file(cbfsname, payload, &filesize,
CBFS_COMPONENT_PAYLOAD, &base); CBFS_COMPONENT_PAYLOAD, &base);
add_file_to_cbfs(cbfsfile, filesize, base); if (add_file_to_cbfs(cbfsfile, filesize, base))
return 1;
writerom(romname, rom, romsize); writerom(romname, rom, romsize);
return 0; return 0;
} }
@ -175,7 +177,8 @@ static int cbfs_add_stage(int argc, char **argv)
create_cbfs_file(cbfsname, stage, &filesize, create_cbfs_file(cbfsname, stage, &filesize,
CBFS_COMPONENT_STAGE, &base); CBFS_COMPONENT_STAGE, &base);
add_file_to_cbfs(cbfsfile, filesize, base); if (add_file_to_cbfs(cbfsfile, filesize, base))
return 1;
writerom(romname, rom, romsize); writerom(romname, rom, romsize);
return 0; return 0;
} }

60
util/cbfstool/common.c
View File

@ -40,7 +40,7 @@ void *loadfile(const char *filename, uint32_t * romsize_p, void *content,
content = malloc(*romsize_p); content = malloc(*romsize_p);
if (!content) { if (!content) {
printf("Could not get %d bytes for file %s\n", printf("Could not get %d bytes for file %s\n",
*romsize_p, filename); *romsize_p, filename);
exit(1); exit(1);
} }
} else if (place == SEEK_END) } else if (place == SEEK_END)
@ -205,40 +205,42 @@ int add_file_to_cbfs(void *content, uint32_t contentsize, uint32_t location)
dprintf("copying data\n"); dprintf("copying data\n");
memcpy(phys_to_virt(current), content, memcpy(phys_to_virt(current), content,
contentsize); contentsize);
break; return 0;
} }
if (location == 0) if (location != 0) {
continue; /* CBFS has the constraint that the chain always moves up in memory. so once
we're past the place we seek, we don't need to look any further */
if (current > location) {
printf
("the requested space is not available\n");
return 1;
}
/* CBFS has the constraint that the chain always moves up in memory. so once /* Is the requested location inside the current chunk? */
we're past the place we seek, we don't need to look any further */ if ((current < location)
if (current > location) { && ((location + contentsize) <=
printf (current + length))) {
("the requested space is not available\n"); /* Split it up. In the next iteration the code will be at the right place. */
return 1; dprintf("split up. new length: %x\n",
} location - current -
ntohl(thisfile->offset));
/* Is the requested location inside the current chunk? */ thisfile->len =
if ((current < location) htonl(location - current -
&& ((location + contentsize) <= (current + length))) { ntohl(thisfile->offset));
/* Split it up. In the next iteration the code will be at the right place. */ struct cbfs_file *nextfile =
dprintf("split up. new length: %x\n", cbfs_create_empty_file(location,
location - current - length -
ntohl(thisfile->offset)); (location -
thisfile->len = current));
htonl(location - current - }
ntohl(thisfile->offset));
struct cbfs_file *nextfile =
cbfs_create_empty_file(location,
length - (location -
current));
} }
} }
current = current =
ALIGN(current + ntohl(thisfile->len) + ALIGN(current + ntohl(thisfile->len) +
ntohl(thisfile->offset), align); ntohl(thisfile->offset), align);
} }
return 0; printf("Could not add the file to CBFS, it's probably too big.\n");
return 1;
} }
/* returns new data block with cbfs_file header, suitable to dump into the ROM. location returns /* returns new data block with cbfs_file header, suitable to dump into the ROM. location returns
@ -263,7 +265,7 @@ void *create_cbfs_file(const char *filename, void *data, uint32_t * datasize,
void *newdata = malloc(*datasize + headersize); void *newdata = malloc(*datasize + headersize);
if (!newdata) { if (!newdata) {
printf("Could not get %d bytes for CBFS file.\n", *datasize + printf("Could not get %d bytes for CBFS file.\n", *datasize +
headersize); headersize);
exit(1); exit(1);
} }
struct cbfs_file *nextfile = (struct cbfs_file *)newdata; struct cbfs_file *nextfile = (struct cbfs_file *)newdata;
@ -285,7 +287,7 @@ int create_cbfs_image(const char *romfile, uint32_t _romsize,
unsigned char *romarea = malloc(romsize); unsigned char *romarea = malloc(romsize);
if (!romarea) { if (!romarea) {
printf("Could not get %d bytes of memory for CBFS image.\n", printf("Could not get %d bytes of memory for CBFS image.\n",
romsize); romsize);
exit(1); exit(1);
} }
memset(romarea, 0xff, romsize); memset(romarea, 0xff, romsize);