Fix Segmentation Fault in ifdtool

If a section is bigger than the FD file it is injected into, and the FD
lies about the size of the FD file, ifdtool would crash because reading
in the section writes beyound the FD file in memory.

Change-Id: Idcfac2b1e2b5907fad34799e44a8abfd89190fcc
Signed-off-by: Stefan Reinauer <reinauer@google.com>
Reviewed-on: http://review.coreboot.org/1754
Tested-by: build bot (Jenkins)
Reviewed-by: Anton Kochkov <anton.kochkov@gmail.com>
This commit is contained in:
Stefan Reinauer 2012-09-25 13:30:48 -07:00 committed by Anton Kochkov
parent 6604ceb6a0
commit 5e93b37310
1 changed files with 6 additions and 0 deletions

View File

@ -397,6 +397,12 @@ void inject_region(char *filename, char *image, int size, int region_type,
memset(image + region.base, 0xff, offset); memset(image + region.base, 0xff, offset);
} }
if (size < region.base + offset + region_size) {
fprintf(stderr, "Output file is too small. (%d < %d)\n",
size, region.base + offset + region_size);
exit(EXIT_FAILURE);
}
if (read(region_fd, image + region.base + offset, region_size) if (read(region_fd, image + region.base + offset, region_size)
!= region_size) { != region_size) {
perror("Could not read file"); perror("Could not read file");