From 263faa8870abe59ea36e42f676045af36d8774e5 Mon Sep 17 00:00:00 2001 From: Zhou Wenjian Date: Wed, 10 Dec 2014 10:35:45 +0800 Subject: [PATCH 2/5] Make elf32 note human readable --- netdump.c | 89 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 89 insertions(+), 0 deletions(-) diff --git a/netdump.c b/netdump.c index c3bd0e3..51403b7 100644 --- a/netdump.c +++ b/netdump.c @@ -46,6 +46,7 @@ static char *get_regs_from_note(char *, ulong *, ulong *); static void kdump_get_osrelease(void); static char *vmcoreinfo_read_string(const char *); void display_note_elf64(void *note_ptr, char *buf); +void display_note_elf32(void *note_ptr, char *buf); #define ELFSTORE 1 @@ -1977,6 +1978,12 @@ dump_Elf32_Nhdr(Elf32_Off offset, int store) } lf = 0; } else { + if (nd->ofp) { + char *l_buf = (char *)malloc(2 * BUFSIZE); + display_note_elf32(note,l_buf); + fprintf(fp, "%s", l_buf); + free(l_buf); + } for (i = lf = 0; i < note->n_descsz/sizeof(ulong); i++) { if (((i%4)==0)) { netdump_print("%s ", @@ -2623,11 +2630,83 @@ display_prstatus_elf64(void *note_ptr, char *buf) ); } +struct x86_user_regs_struct { + unsigned long ebx,ecx,edx,esi,edi,ebp,eax; + unsigned long ds,es,fs,gs,orig_eax; + unsigned long eip,cs,eflags; + unsigned long esp,ss; +}; + +struct x86_prstatus { + int si_signo; + int si_code; + int si_errno; + short cursig; + unsigned long sigpend; + unsigned long sighold; + int pid; + int ppid; + int pgrp; + int sid; + struct timeval utime; + struct timeval stime; + struct timeval cutime; + struct timeval cstime; + struct x86_user_regs_struct regs; + int fpvalid; +}; + +static void +display_prstatus_elf32(void *note_ptr, char *buf) +{ + struct x86_prstatus *pr; + Elf32_Nhdr *note; + + note = (Elf32_Nhdr *)note_ptr; + pr = (struct x86_prstatus *)( + (char *)note + sizeof(Elf32_Nhdr) + note->n_namesz); + pr = (struct x86_prstatus *)roundup((ulong)pr, 4); + + sprintf(buf, + "\t\tsi.signo: %d si.code: %d si.errno: %d cursig: %d\n" + "\t\tsigpend : %lu\n" + "\t\tsighold : %lu\n" + "\t\tpid: %d ppid: %d pgrp: %d sid: %d\n" + "\t\tutime: %01lld.%06d, stime: %01lld.%06d, cutime: %01lld.%06d, " + "cstime: %01lld.%06d\n" + "\t\torig_eax: %lu, fpvalid: %d\n" + "\t\tEBX : 0x%08lx\tECX : 0x%08lx\n" + "\t\tEDX : 0x%08lx\tESI : 0x%08lx\n" + "\t\tEDI : 0x%08lx\tEBP : 0x%08lx\n" + "\t\tEAX : 0x%08lx\tEIP : 0x%08lx\n" + "\t\tEFLAGS : 0x%08lx\tESP : 0x%08lx\n" + "\t\tDS: 0x%04lx ES: 0x%04lx FS: 0x%04lx GS: 0x%04lx " + "CS: 0x%04lx SS: 0x%04lx\n", + pr->si_signo, pr->si_code, pr->si_errno, pr->cursig, + pr->sigpend, pr->sighold, + pr->pid, pr->ppid, pr->pgrp, pr->sid, + (long long)pr->utime.tv_sec, (int)pr->utime.tv_usec, + (long long)pr->stime.tv_sec, (int)pr->stime.tv_usec, + (long long)pr->cutime.tv_sec, (int)pr->cutime.tv_usec, + (long long)pr->cstime.tv_sec, (int)pr->cstime.tv_usec, + pr->regs.orig_eax, pr->fpvalid, + pr->regs.ebx, pr->regs.ecx, + pr->regs.edx, pr->regs.esi, + pr->regs.edi, pr->regs.ebp, + pr->regs.eax, pr->regs.eip, + pr->regs.eflags, pr->regs.esp, + pr->regs.ds, pr->regs.es, pr->regs.fs, + pr->regs.gs, pr->regs.cs, pr->regs.ss + ); +} + static void display_note(void *note_ptr, char *buf, int descsz) { if (descsz == (2 * sizeof(struct x86_64_prstatus))) display_prstatus_elf64(note_ptr, buf); + else if (descsz == sizeof(struct x86_prstatus)) + display_prstatus_elf32(note_ptr, buf); } void @@ -2640,6 +2719,16 @@ display_note_elf64(void *note_ptr, char *buf) display_note(note_ptr, buf, 2 * (note->n_descsz)); } +void +display_note_elf32(void *note_ptr, char *buf) +{ + Elf32_Nhdr *note; + + note = (Elf32_Nhdr *)note_ptr; + + display_note(note_ptr, buf, note->n_descsz); +} + void get_netdump_regs_x86_64(struct bt_info *bt, ulong *ripp, ulong *rspp) { -- 1.7.1