diff options
| author | Stefan Reinauer <stepan@coresystems.de> | 2009-09-22 15:55:01 +0000 |
|---|---|---|
| committer | Stefan Reinauer <stepan@openbios.org> | 2009-09-22 15:55:01 +0000 |
| commit | 853270af390f9e200f4a165ec55d3b2fa5246c0b (patch) | |
| tree | 6567b87c2f645a5c0c29b39c277f1b5de95f19a3 /util | |
| parent | 0e0655e6ef815524107481856e40266ba23248f1 (diff) | |
| download | coreboot-853270af390f9e200f4a165ec55d3b2fa5246c0b.tar.xz | |
* guard all mallocs in cbfstool
* fix an issue that could lead to cbfstool writing outside of its allocated
memory
Signed-off-by: Stefan Reinauer <stepan@coresystems.de>
Acked-by: Peter Stuge <peter@stuge.se>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@4653 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
Diffstat (limited to 'util')
| -rw-r--r-- | util/cbfstool/common.c | 27 | ||||
| -rw-r--r-- | util/cbfstool/common.h | 4 |
2 files changed, 27 insertions, 4 deletions
diff --git a/util/cbfstool/common.c b/util/cbfstool/common.c index 9227337c57..7a9e6f1e4b 100644 --- a/util/cbfstool/common.c +++ b/util/cbfstool/common.c @@ -36,10 +36,16 @@ void *loadfile(const char *filename, uint32_t * romsize_p, void *content, fseek(file, 0, SEEK_END); *romsize_p = ftell(file); fseek(file, 0, SEEK_SET); - if (!content) + if (!content) { content = malloc(*romsize_p); - else if (place == SEEK_END) + if (!content) { + printf("Could not get %d bytes for file %s\n", + *romsize_p, filename); + exit(1); + } + } else if (place == SEEK_END) content -= *romsize_p; + if (!fread(content, *romsize_p, 1, file)) { printf("failed to read %s\n", filename); return NULL; @@ -255,6 +261,11 @@ void *create_cbfs_file(const char *filename, void *data, uint32_t * datasize, *location -= headersize; } void *newdata = malloc(*datasize + headersize); + if (!newdata) { + printf("Could not get %d bytes for CBFS file.\n", *datasize + + headersize); + exit(1); + } struct cbfs_file *nextfile = (struct cbfs_file *)newdata; strncpy(nextfile->magic, "LARCHIVE", 8); nextfile->len = htonl(*datasize); @@ -272,8 +283,15 @@ int create_cbfs_image(const char *romfile, uint32_t _romsize, { romsize = _romsize; unsigned char *romarea = malloc(romsize); + if (!romarea) { + printf("Could not get %d bytes of memory for CBFS image.\n", + romsize); + exit(1); + } memset(romarea, 0xff, romsize); - recalculate_rom_geometry(romarea); + + // Set up physical/virtual mapping + offset = romarea + romsize - 0x100000000ULL; if (align == 0) align = 64; @@ -291,6 +309,9 @@ int create_cbfs_image(const char *romfile, uint32_t _romsize, master_header->offset = htonl(0); ((uint32_t *) phys_to_virt(0xfffffffc))[0] = virt_to_phys(master_header); + + recalculate_rom_geometry(romarea); + struct cbfs_file *one_empty_file = cbfs_create_empty_file((0 - romsize) & 0xffffffff, romsize - bootblocksize - diff --git a/util/cbfstool/common.h b/util/cbfstool/common.h index 944f215b5d..a41eb8a439 100644 --- a/util/cbfstool/common.h +++ b/util/cbfstool/common.h @@ -29,7 +29,7 @@ static void *phys_to_virt(uint32_t addr) static uint32_t virt_to_phys(void *addr) { - return (long)(addr - offset) & 0xffffffff; + return (unsigned long)(addr - offset) & 0xffffffff; } #define ALIGN(val, by) (((val) + (by)-1)&~((by)-1)) @@ -61,3 +61,5 @@ int create_cbfs_image(const char *romfile, uint32_t romsize, int add_file_to_cbfs(void *content, uint32_t contentsize, uint32_t location); void print_cbfs_directory(const char *filename); + +#define ARRAY_SIZE(a) (sizeof(a) / sizeof((a)[0])) |