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@gmail.com>
Acked-by: Peter Stuge <peter@stuge.se>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@4641 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1

diff --git a/util/cbfstool/Makefile b/util/cbfstool/Makefile
index 94712bdd6d0bbd2375ad943f761b73a012affec5..d74c44ee5d72bbc40b587ff0a673ebebd6dcb469 100644 (file)
--- a/util/cbfstool/Makefile
+++ b/util/cbfstool/Makefile
@@ -2,6 +2,8 @@ obj ?= $(shell pwd)
 
 HOSTCXX ?= g++
 HOSTCC ?= gcc
+CFLAGS ?= -g
+
 
 BINARY:=$(obj)/cbfstool
 

diff --git a/util/cbfstool/cbfs-mkpayload.c b/util/cbfstool/cbfs-mkpayload.c
index 4f0e2481234fbd7549ec44490367a7f6d33ca353..f8cc1616b0449e21fab0abd9e8e6863e22738a93 100644 (file)
--- a/util/cbfstool/cbfs-mkpayload.c
+++ b/util/cbfstool/cbfs-mkpayload.c
@@ -75,8 +75,10 @@ int parse_elf_to_payload(unsigned char *input, unsigned char **output,
 
                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,