libdwfl: Don't allocate all phdrs on the stack in elf_from_remote_memory.
Signed-off-by: Mark Wielaard <mjw@redhat.com>
diff --git a/libdwfl/elf-from-memory.c b/libdwfl/elf-from-memory.c
index b35fac7..ed8f6e9 100644
--- a/libdwfl/elf-from-memory.c
+++ b/libdwfl/elf-from-memory.c
@@ -1,5 +1,5 @@
/* Reconstruct an ELF file by reading the segments out of remote memory.
- Copyright (C) 2005-2011, 2014 Red Hat, Inc.
+ Copyright (C) 2005-2011, 2014, 2015 Red Hat, Inc.
This file is part of elfutils.
This file is free software; you can redistribute it and/or modify
@@ -63,11 +63,15 @@
size_t maxread),
void *arg)
{
+ /* We might have to reserve some memory for the phdrs. Set to NULL
+ here so we can always safely free it. */
+ void *phdrsp = NULL;
+
/* First read in the file header and check its sanity. */
const size_t initial_bufsize = 256;
unsigned char *buffer = malloc (initial_bufsize);
- if (buffer == NULL)
+ if (unlikely (buffer == NULL))
{
no_memory:
__libdwfl_seterrno (DWFL_E_NOMEM);
@@ -80,6 +84,7 @@
{
read_error:
free (buffer);
+ free (phdrsp);
__libdwfl_seterrno (nread < 0 ? DWFL_E_ERRNO : DWFL_E_TRUNCATED);
return NULL;
}
@@ -88,6 +93,7 @@
{
bad_elf:
free (buffer);
+ free (phdrsp);
__libdwfl_seterrno (DWFL_E_BADELF);
return NULL;
}
@@ -172,6 +178,7 @@
if (newbuf == NULL)
{
free (buffer);
+ free (phdrsp);
goto no_memory;
}
buffer = newbuf;
@@ -184,14 +191,22 @@
xlatefrom.d_buf = buffer;
}
- union
+ typedef union
{
Elf32_Phdr p32[phnum];
Elf64_Phdr p64[phnum];
- } phdrs;
+ } phdrsn;
- xlateto.d_buf = &phdrs;
- xlateto.d_size = sizeof phdrs;
+ phdrsp = malloc (sizeof (phdrsn));
+ if (unlikely (phdrsp == NULL))
+ {
+ free (buffer);
+ goto no_memory;
+ }
+ phdrsn *phdrs = (phdrsn *) phdrsp;
+
+ xlateto.d_buf = phdrs;
+ xlateto.d_size = sizeof (phdrsn);
/* Scan for PT_LOAD segments to find the total size of the file image. */
size_t contents_size = 0;
@@ -234,9 +249,9 @@
ehdr.e32.e_ident[EI_DATA]) == NULL)
goto libelf_error;
for (uint_fast16_t i = 0; i < phnum; ++i)
- if (phdrs.p32[i].p_type == PT_LOAD)
- if (handle_segment (phdrs.p32[i].p_vaddr, phdrs.p32[i].p_offset,
- phdrs.p32[i].p_filesz, phdrs.p32[i].p_memsz))
+ if (phdrs->p32[i].p_type == PT_LOAD)
+ if (handle_segment (phdrs->p32[i].p_vaddr, phdrs->p32[i].p_offset,
+ phdrs->p32[i].p_filesz, phdrs->p32[i].p_memsz))
goto bad_elf;
break;
@@ -245,9 +260,9 @@
ehdr.e64.e_ident[EI_DATA]) == NULL)
goto libelf_error;
for (uint_fast16_t i = 0; i < phnum; ++i)
- if (phdrs.p64[i].p_type == PT_LOAD)
- if (handle_segment (phdrs.p64[i].p_vaddr, phdrs.p64[i].p_offset,
- phdrs.p64[i].p_filesz, phdrs.p64[i].p_memsz))
+ if (phdrs->p64[i].p_type == PT_LOAD)
+ if (handle_segment (phdrs->p64[i].p_vaddr, phdrs->p64[i].p_offset,
+ phdrs->p64[i].p_filesz, phdrs->p64[i].p_memsz))
goto bad_elf;
break;
@@ -276,7 +291,10 @@
/* Now we know the size of the whole image we want read in. */
buffer = calloc (1, contents_size);
if (buffer == NULL)
- goto no_memory;
+ {
+ free (phdrsp);
+ goto no_memory;
+ }
switch (ehdr.e32.e_ident[EI_CLASS])
{
@@ -297,9 +315,9 @@
case ELFCLASS32:
for (uint_fast16_t i = 0; i < phnum; ++i)
- if (phdrs.p32[i].p_type == PT_LOAD)
- if (handle_segment (phdrs.p32[i].p_vaddr, phdrs.p32[i].p_offset,
- phdrs.p32[i].p_filesz))
+ if (phdrs->p32[i].p_type == PT_LOAD)
+ if (handle_segment (phdrs->p32[i].p_vaddr, phdrs->p32[i].p_offset,
+ phdrs->p32[i].p_filesz))
goto read_error;
/* If the segments visible in memory didn't include the section
@@ -324,9 +342,9 @@
case ELFCLASS64:
for (uint_fast16_t i = 0; i < phnum; ++i)
- if (phdrs.p64[i].p_type == PT_LOAD)
- if (handle_segment (phdrs.p64[i].p_vaddr, phdrs.p64[i].p_offset,
- phdrs.p64[i].p_filesz))
+ if (phdrs->p64[i].p_type == PT_LOAD)
+ if (handle_segment (phdrs->p64[i].p_vaddr, phdrs->p64[i].p_offset,
+ phdrs->p64[i].p_filesz))
goto read_error;
/* If the segments visible in memory didn't include the section
@@ -354,6 +372,9 @@
break;
}
+ free (phdrsp);
+ phdrs = phdrsp = NULL;
+
/* Now we have the image. Open libelf on it. */
Elf *elf = elf_memory ((char *) buffer, contents_size);