X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Ftarget%2Fimage.c;h=0247310f637f84e1c789d4c609c148cdddff99ac;hp=45107b4854860e7abccc20d3359cf68ec22e5f39;hb=24df46d0676630c90f04ee49b96533f5fddca6cd;hpb=d61714f4d5d72f9f39fbccbb1c3ba5f3d8982020 diff --git a/src/target/image.c b/src/target/image.c index 45107b4854..0247310f63 100644 --- a/src/target/image.c +++ b/src/target/image.c @@ -2,12 +2,15 @@ * Copyright (C) 2007 by Dominic Rath * * Dominic.Rath@gmx.de * * * - * Copyright (C) 2007,2008 Øyvind Harboe * + * Copyright (C) 2007,2008 Øyvind Harboe * * oyvind.harboe@zylin.com * * * * Copyright (C) 2008 by Spencer Oliver * * spen@spen-soft.co.uk * * * + * Copyright (C) 2009 by Franck Hereson * + * franck.hereson@secad.fr * + * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * * the Free Software Foundation; either version 2 of the License, or * @@ -34,17 +37,17 @@ /* convert ELF header field to host endianness */ #define field16(elf,field)\ - ((elf->endianness==ELFDATA2LSB)? \ + ((elf->endianness == ELFDATA2LSB)? \ le_to_h_u16((uint8_t*)&field):be_to_h_u16((uint8_t*)&field)) #define field32(elf,field)\ - ((elf->endianness==ELFDATA2LSB)? \ + ((elf->endianness == ELFDATA2LSB)? \ le_to_h_u32((uint8_t*)&field):be_to_h_u32((uint8_t*)&field)) -static int autodetect_image_type(image_t *image, char *url) +static int autodetect_image_type(image_t *image, const char *url) { int retval; - fileio_t fileio; + struct fileio fileio; uint32_t read_bytes; uint8_t buffer[9]; @@ -55,11 +58,11 @@ static int autodetect_image_type(image_t *image, char *url) } retval = fileio_read(&fileio, 9, buffer, &read_bytes); - if (retval==ERROR_OK) + if (retval == ERROR_OK) { if (read_bytes != 9) { - retval=ERROR_FILEIO_OPERATION_FAILED; + retval = ERROR_FILEIO_OPERATION_FAILED; } } fileio_close(&fileio); @@ -68,7 +71,7 @@ static int autodetect_image_type(image_t *image, char *url) return retval; /* check header against known signatures */ - if (strncmp((char*)buffer,ELFMAG,SELFMAG)==0) + if (strncmp((char*)buffer,ELFMAG,SELFMAG) == 0) { LOG_DEBUG("ELF image detected."); image->type = IMAGE_ELF; @@ -81,7 +84,7 @@ static int autodetect_image_type(image_t *image, char *url) &&(isxdigit(buffer[5])) &&(isxdigit(buffer[6])) &&(buffer[7]=='0') /* record type : 00 -> 05 */ - &&(buffer[8]>='0')&&(buffer[8]<'6')) + &&(buffer[8]>='0') && (buffer[8]<'6')) { LOG_DEBUG("IHEX image detected."); image->type = IMAGE_IHEX; @@ -103,7 +106,7 @@ static int autodetect_image_type(image_t *image, char *url) return ERROR_OK; } -static int identify_image_type(image_t *image, char *type_string, char *url) +static int identify_image_type(image_t *image, const char *type_string, const char *url) { if (type_string) { @@ -147,7 +150,7 @@ static int identify_image_type(image_t *image, char *type_string, char *url) static int image_ihex_buffer_complete(image_t *image) { image_ihex_t *ihex = image->type_private; - fileio_t *fileio = &ihex->fileio; + struct fileio *fileio = &ihex->fileio; uint32_t full_address = 0x0; uint32_t cooked_bytes; int i; @@ -155,7 +158,7 @@ static int image_ihex_buffer_complete(image_t *image) /* we can't determine the number of sections that we'll have to create ahead of time, * so we locally hold them until parsing is finished */ - image_section_t section[IMAGE_MAX_SECTIONS]; + struct image_section section[IMAGE_MAX_SECTIONS]; ihex->buffer = malloc(fileio->size >> 1); cooked_bytes = 0x0; @@ -196,6 +199,12 @@ static int image_ihex_buffer_complete(image_t *image) if (section[image->num_sections].size != 0) { image->num_sections++; + if (image->num_sections >= IMAGE_MAX_SECTIONS) + { + /* too many sections */ + LOG_ERROR("Too many sections found in IHEX file"); + return ERROR_IMAGE_FORMAT_ERROR; + } section[image->num_sections].size = 0x0; section[image->num_sections].flags = 0; section[image->num_sections].private = &ihex->buffer[cooked_bytes]; @@ -223,7 +232,7 @@ static int image_ihex_buffer_complete(image_t *image) image->num_sections++; /* copy section information */ - image->sections = malloc(sizeof(image_section_t) * image->num_sections); + image->sections = malloc(sizeof(struct image_section) * image->num_sections); for (i = 0; i < image->num_sections; i++) { image->sections[i].private = section[i].private; @@ -252,6 +261,12 @@ static int image_ihex_buffer_complete(image_t *image) if (section[image->num_sections].size != 0) { image->num_sections++; + if (image->num_sections >= IMAGE_MAX_SECTIONS) + { + /* too many sections */ + LOG_ERROR("Too many sections found in IHEX file"); + return ERROR_IMAGE_FORMAT_ERROR; + } section[image->num_sections].size = 0x0; section[image->num_sections].flags = 0; section[image->num_sections].private = &ihex->buffer[cooked_bytes]; @@ -292,6 +307,12 @@ static int image_ihex_buffer_complete(image_t *image) if (section[image->num_sections].size != 0) { image->num_sections++; + if (image->num_sections >= IMAGE_MAX_SECTIONS) + { + /* too many sections */ + LOG_ERROR("Too many sections found in IHEX file"); + return ERROR_IMAGE_FORMAT_ERROR; + } section[image->num_sections].size = 0x0; section[image->num_sections].flags = 0; section[image->num_sections].private = &ihex->buffer[cooked_bytes]; @@ -382,7 +403,7 @@ static int image_elf_read_headers(image_t *image) } elf->segment_count = field16(elf,elf->header->e_phnum); - if (elf->segment_count==0) + if (elf->segment_count == 0) { LOG_ERROR("invalid ELF file, no program headers"); return ERROR_IMAGE_FORMAT_ERROR; @@ -414,12 +435,12 @@ static int image_elf_read_headers(image_t *image) /* count useful segments (loadable), ignore BSS section */ image->num_sections = 0; - for (i=0;isegment_count;i++) + for (i = 0;i < elf->segment_count;i++) if ((field32(elf, elf->segments[i].p_type) == PT_LOAD) && (field32(elf, elf->segments[i].p_filesz) != 0)) image->num_sections++; /* alloc and fill sections array with loadable segments */ - image->sections = malloc(image->num_sections * sizeof(image_section_t)); - for (i=0,j=0;isegment_count;i++) + image->sections = malloc(image->num_sections * sizeof(struct image_section)); + for (i = 0,j = 0;i < elf->segment_count;i++) { if ((field32(elf, elf->segments[i].p_type) == PT_LOAD) && (field32(elf, elf->segments[i].p_filesz) != 0)) { @@ -446,17 +467,17 @@ static int image_elf_read_section(image_t *image, int section, uint32_t offset, *size_read = 0; - LOG_DEBUG("load segment %d at 0x%" PRIx32 " (sz=0x%" PRIx32 ")",section,offset,size); + LOG_DEBUG("load segment %d at 0x%" PRIx32 " (sz = 0x%" PRIx32 ")",section,offset,size); /* read initialized data in current segment if any */ - if (offsetp_filesz)) + if (offset < field32(elf,segment->p_filesz)) { /* maximal size present in file for the current segment */ read_size = MIN(size, field32(elf,segment->p_filesz)-offset); LOG_DEBUG("read elf: size = 0x%" PRIx32 " at 0x%" PRIx32 "",read_size, - field32(elf,segment->p_offset)+offset); + field32(elf,segment->p_offset) + offset); /* read initialized area of the segment */ - if ((retval = fileio_seek(&elf->fileio, field32(elf,segment->p_offset)+offset)) != ERROR_OK) + if ((retval = fileio_seek(&elf->fileio, field32(elf,segment->p_offset) + offset)) != ERROR_OK) { LOG_ERROR("cannot find ELF segment content, seek failed"); return retval; @@ -481,7 +502,7 @@ static int image_elf_read_section(image_t *image, int section, uint32_t offset, static int image_mot_buffer_complete(image_t *image) { image_mot_t *mot = image->type_private; - fileio_t *fileio = &mot->fileio; + struct fileio *fileio = &mot->fileio; uint32_t full_address = 0x0; uint32_t cooked_bytes; int i; @@ -489,7 +510,7 @@ static int image_mot_buffer_complete(image_t *image) /* we can't determine the number of sections that we'll have to create ahead of time, * so we locally hold them until parsing is finished */ - image_section_t section[IMAGE_MAX_SECTIONS]; + struct image_section section[IMAGE_MAX_SECTIONS]; mot->buffer = malloc(fileio->size >> 1); cooked_bytes = 0x0; @@ -533,7 +554,7 @@ static int image_mot_buffer_complete(image_t *image) } else if (record_type >= 1 && record_type <= 3) { - switch ( record_type ) + switch (record_type) { case 1: /* S1 - 16 bit address data record */ @@ -614,7 +635,7 @@ static int image_mot_buffer_complete(image_t *image) image->num_sections++; /* copy section information */ - image->sections = malloc(sizeof(image_section_t) * image->num_sections); + image->sections = malloc(sizeof(struct image_section) * image->num_sections); for (i = 0; i < image->num_sections; i++) { image->sections[i].private = section[i].private; @@ -636,7 +657,7 @@ static int image_mot_buffer_complete(image_t *image) cal_checksum += (uint8_t)checksum; bytes_read += 2; - if ( cal_checksum != 0xFF ) + if (cal_checksum != 0xFF) { /* checksum failed */ LOG_ERROR("incorrect record checksum found in S19 file"); @@ -648,7 +669,7 @@ static int image_mot_buffer_complete(image_t *image) return ERROR_IMAGE_FORMAT_ERROR; } -int image_open(image_t *image, char *url, char *type_string) +int image_open(image_t *image, const char *url, const char *type_string) { int retval = ERROR_OK; @@ -669,7 +690,7 @@ int image_open(image_t *image, char *url, char *type_string) } image->num_sections = 1; - image->sections = malloc(sizeof(image_section_t)); + image->sections = malloc(sizeof(struct image_section)); image->sections[0].base_address = 0x0; image->sections[0].size = image_binary->fileio.size; image->sections[0].flags = 0; @@ -722,7 +743,7 @@ int image_open(image_t *image, char *url, char *type_string) image_memory_t *image_memory; image->num_sections = 1; - image->sections = malloc(sizeof(image_section_t)); + image->sections = malloc(sizeof(struct image_section)); image->sections[0].base_address = 0x0; image->sections[0].size = 0xffffffff; image->sections[0].flags = 0; @@ -762,15 +783,15 @@ int image_open(image_t *image, char *url, char *type_string) { /* relocate */ int section; - for (section=0; section < image->num_sections; section++) + for (section = 0; section < image->num_sections; section++) { image->sections[section].base_address += image->base_address; } /* we're done relocating. The two statements below are mainly * for documenation purposes: stop anyone from empirically * thinking they should use these values henceforth. */ - image->base_address=0; - image->base_address_set=0; + image->base_address = 0; + image->base_address_set = 0; } return retval; @@ -852,7 +873,7 @@ int image_read_section(image_t *image, int section, uint32_t offset, uint32_t si memcpy(buffer + *size_read, image_memory->cache + (address - image_memory->cache_address), (size_in_cache > size) ? size : size_in_cache - ); +); *size_read += (size_in_cache > size) ? size : size_in_cache; address += (size_in_cache > size) ? size : size_in_cache; @@ -878,7 +899,7 @@ int image_read_section(image_t *image, int section, uint32_t offset, uint32_t si int image_add_section(image_t *image, uint32_t base, uint32_t size, int flags, uint8_t *data) { - image_section_t *section; + struct image_section *section; /* only image builder supports adding sections */ if (image->type != IMAGE_BUILDER) @@ -902,7 +923,7 @@ int image_add_section(image_t *image, uint32_t base, uint32_t size, int flags, u /* allocate new section */ image->num_sections++; - image->sections = realloc(image->sections, sizeof(image_section_t) * image->num_sections); + image->sections = realloc(image->sections, sizeof(struct image_section) * image->num_sections); section = &image->sections[image->num_sections - 1]; section->base_address = base; section->size = size; @@ -1015,12 +1036,12 @@ int image_calculate_checksum(uint8_t* buffer, uint32_t nbytes, uint32_t* checksu crc32_table[i] = c; } - while (nbytes>0) + while (nbytes > 0) { - int run=nbytes; - if (run>32768) + int run = nbytes; + if (run > 32768) { - run=32768; + run = 32768; } nbytes -= run; while (run--)