m2-internship/libunwind-eh_elf
1
0
Fork 0
mirror of https://github.com/tobast/libunwind-eh_elf.git synced 2024-11-25 16:47:38 +01:00
Code Issues Releases Activity

Clean up the elf notes handling in the coredump code

Browse source 
We centralize the elf notes handling code in some macros, thus
simplifying the loops over the notes and avoiding code duplication.
This commit is contained in:
Alexander Larsson 2012-03-26 11:18:23 +02:00 committed by Arun Sharma
parent 0628a9872c
commit b1393b7e63
1 changed files with 15 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
src/coredump/_UCD_create.c
View file

@ -66,6 +66,12 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
#include "_UCD_lib.h" #include "_UCD_lib.h"
#include "_UCD_internal.h" #include "_UCD_internal.h"
#define NOTE_DATA(_hdr) STRUCT_MEMBER_P((_hdr), sizeof (Elf32_Nhdr) + ALIGN((_hdr)->n_namesz, 4))
#define NOTE_SIZE(_hdr) (sizeof (Elf32_Nhdr) + ALIGN((_hdr)->n_namesz, 4) + (_hdr)->n_descsz)
#define NOTE_NEXT(_hdr) STRUCT_MEMBER_P((_hdr), NOTE_SIZE(_hdr))
#define NOTE_FITS_IN(_hdr, _size) ((_size) >= sizeof (Elf32_Nhdr) && (_size) >= NOTE_SIZE (_hdr))
#define NOTE_FITS(_hdr, _end) NOTE_FITS_IN((_hdr), (unsigned long)((char *)(_end) - (char *)(_hdr)))
struct UCD_info * struct UCD_info *
_UCD_create(const char *filename) _UCD_create(const char *filename)
{ {
@ -206,7 +212,7 @@ _UCD_create(const char *filename)
Debug(2, "phdr[%03d]: type:%d", i, cur->p_type); Debug(2, "phdr[%03d]: type:%d", i, cur->p_type);
if (cur->p_type == PT_NOTE) if (cur->p_type == PT_NOTE)
{ {
unsigned char *p, *note_end; Elf32_Nhdr *note_hdr, *note_end;
unsigned n_threads; unsigned n_threads;
ui->note_phdr = malloc(cur->p_filesz); ui->note_phdr = malloc(cur->p_filesz);
@ -217,51 +223,30 @@ _UCD_create(const char *filename)
goto err; goto err;
} }
note_end = (unsigned char *)ui->note_phdr + cur->p_filesz; note_end = STRUCT_MEMBER_P (ui->note_phdr, cur->p_filesz);
/* Count number of threads */ /* Count number of threads */
n_threads = 0; n_threads = 0;
p = ui->note_phdr; note_hdr = (Elf32_Nhdr *)ui->note_phdr;
while (p + sizeof (Elf32_Nhdr) <= note_end) while (NOTE_FITS (note_hdr, note_end))
{ {
Elf32_Nhdr *note_hdr = (Elf32_Nhdr *)p;
unsigned char *p_next;
p_next = p + sizeof (Elf32_Nhdr)
+ ((note_hdr->n_namesz + 3) & ~3L)
+ note_hdr->n_descsz;
if (p_next >= note_end)
break;
if (note_hdr->n_type == NT_PRSTATUS) if (note_hdr->n_type == NT_PRSTATUS)
n_threads++; n_threads++;
p = p_next; note_hdr = NOTE_NEXT (note_hdr);
} }
ui->n_threads = n_threads; ui->n_threads = n_threads;
ui->threads = malloc(sizeof (void *) * n_threads); ui->threads = malloc(sizeof (void *) * n_threads);
n_threads = 0; n_threads = 0;
p = ui->note_phdr; note_hdr = (Elf32_Nhdr *)ui->note_phdr;
while (p + sizeof (Elf32_Nhdr) <= note_end) while (NOTE_FITS (note_hdr, note_end))
{ {
Elf32_Nhdr *note_hdr = (Elf32_Nhdr *)p;
unsigned char *p_next;
p_next = p + sizeof (Elf32_Nhdr)
+ ((note_hdr->n_namesz + 3) & ~3L)
+ note_hdr->n_descsz;
if (p_next >= note_end)
break;
if (note_hdr->n_type == NT_PRSTATUS) if (note_hdr->n_type == NT_PRSTATUS)
ui->threads[n_threads++] = (void*) ((((long)note_hdr ui->threads[n_threads++] = NOTE_DATA (note_hdr);
+ sizeof(*note_hdr) + note_hdr->n_namesz) + 3) & ~3L);
p = p_next; note_hdr = NOTE_NEXT (note_hdr);
} }
} }
if (cur->p_type == PT_LOAD) if (cur->p_type == PT_LOAD)