GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

libpayload: Fix malloc allocation 

Apparently the previous version worked on luck.  Fix the allocation
and add parens to better guide the compiler.  Also, halt() if 
the heap is poisoned (like by an overrun).  Finally, fix calloc()
so that it actually works.

Signed-off-by: Jordan Crouse <jordan.crouse@amd.com>
Acked-by: Peter Stuge <peter@stuge.se>



git-svn-id: svn://svn.coreboot.org/coreboot/trunk@3269 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
This commit is contained in:
Jordan Crouse 2008-04-25 23:08:47 +00:00
parent c781584936
commit 24a0404759
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
payloads/libpayload/libc/malloc.c
View File

@ -67,7 +67,8 @@ void print_malloc_map(void);
static void setup(void) static void setup(void)
{ {
int size = (unsigned int)(_heap - _eheap) - HDRSIZE; int size = (unsigned int)(&_eheap - &_heap) - HDRSIZE;
*((hdrtype_t *) hstart) = FREE_BLOCK(size); *((hdrtype_t *) hstart) = FREE_BLOCK(size);
} }
@ -91,9 +92,12 @@ static void *alloc(int len)
header = *((hdrtype_t *) ptr); header = *((hdrtype_t *) ptr);
int size = SIZE(header); int size = SIZE(header);
if (!HAS_MAGIC(header) || size == 0)
halt();
if (header & FLAG_FREE) { if (header & FLAG_FREE) {
if (len <= size) { if (len <= size) {
void *nptr = ptr + HDRSIZE + len; void *nptr = ptr + (HDRSIZE + len);
int nsize = size - (len + 8); int nsize = size - (len + 8);
/* Mark the block as used. */ /* Mark the block as used. */
@ -102,6 +106,7 @@ static void *alloc(int len)
/* If there is still room in this block, /* If there is still room in this block,
* then mark it as such. * then mark it as such.
*/ */
if (nsize > 0) if (nsize > 0)
*((hdrtype_t *) nptr) = *((hdrtype_t *) nptr) =
FREE_BLOCK(nsize - 4); FREE_BLOCK(nsize - 4);
@ -184,8 +189,8 @@ void *malloc(size_t size)
void *calloc(size_t nmemb, size_t size) void *calloc(size_t nmemb, size_t size)
{ {
unsigned int total = (nmemb * size); size_t total = nmemb * size;
void *ptr = alloc(size); void *ptr = alloc(total);
if (ptr) if (ptr)
memset(ptr, 0, total); memset(ptr, 0, total);