[coreboot] [v2] r4641 - trunk/coreboot-v2/util/cbfstool

[svn at coreboot.org]

Author: rminnich
Date: 2009-09-17 17:35:08 +0200 (Thu, 17 Sep 2009)
New Revision: 4641

Modified:
   trunk/coreboot-v2/util/cbfstool/Makefile
   trunk/coreboot-v2/util/cbfstool/cbfs-mkpayload.c
Log:
There was a missing addition of the size of the .notes.pinfo 
section header which could lead to corrupted malloc arena. 

Also, make cbfstool always build with debugging on. Performance
is not an issue here. Don't strip it either. 

Signed-off-by: Ronald G. Minnich <rminnich at gmail.com>
Acked-by: Peter Stuge <peter at stuge.se>


Modified: trunk/coreboot-v2/util/cbfstool/Makefile
===================================================================
--- trunk/coreboot-v2/util/cbfstool/Makefile	2009-09-17 00:28:29 UTC (rev 4640)
+++ trunk/coreboot-v2/util/cbfstool/Makefile	2009-09-17 15:35:08 UTC (rev 4641)
@@ -2,7 +2,9 @@
 
 HOSTCXX ?= g++
 HOSTCC ?= gcc
+CFLAGS ?= -g
 
+
 BINARY:=$(obj)/cbfstool
 
 COMMON:=common.o compress.o minilzma.o

Modified: trunk/coreboot-v2/util/cbfstool/cbfs-mkpayload.c
===================================================================
--- trunk/coreboot-v2/util/cbfstool/cbfs-mkpayload.c	2009-09-17 00:28:29 UTC (rev 4640)
+++ trunk/coreboot-v2/util/cbfstool/cbfs-mkpayload.c	2009-09-17 15:35:08 UTC (rev 4641)
@@ -75,8 +75,10 @@
 
 		name = (char *)(strtab + shdr[i].sh_name);
 
-		if (!strcmp(name, ".note.pinfo"))
+		if (!strcmp(name, ".note.pinfo")) {
 			segments++;
+			isize += (unsigned int)shdr[i].sh_size;
+		}
 	}
 
 	/* Now, regular headers - we only care about PT_LOAD headers,