From 5e93b37310abe92ba101a32fe66c9e02f8d887e9 Mon Sep 17 00:00:00 2001 From: Stefan Reinauer Date: Tue, 25 Sep 2012 13:30:48 -0700 Subject: 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 Reviewed-on: http://review.coreboot.org/1754 Tested-by: build bot (Jenkins) Reviewed-by: Anton Kochkov --- util/ifdtool/ifdtool.c | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'util/ifdtool/ifdtool.c') diff --git a/util/ifdtool/ifdtool.c b/util/ifdtool/ifdtool.c index 1b418d10b8..1a8bf85059 100644 --- a/util/ifdtool/ifdtool.c +++ b/util/ifdtool/ifdtool.c @@ -397,6 +397,12 @@ void inject_region(char *filename, char *image, int size, int region_type, 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) != region_size) { perror("Could not read file"); -- cgit v1.2.3