From patchwork Mon Nov 1 15:01:15 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Graf X-Patchwork-Id: 69779 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id A010E1007D2 for ; Tue, 2 Nov 2010 02:13:47 +1100 (EST) Received: from localhost ([127.0.0.1]:52365 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PCw4e-0001vU-L2 for incoming@patchwork.ozlabs.org; Mon, 01 Nov 2010 11:13:28 -0400 Received: from [140.186.70.92] (port=52699 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PCvtt-0003Yt-UD for qemu-devel@nongnu.org; Mon, 01 Nov 2010 11:02:24 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PCvtZ-0000in-0C for qemu-devel@nongnu.org; Mon, 01 Nov 2010 11:02:11 -0400 Received: from cantor.suse.de ([195.135.220.2]:60250 helo=mx1.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PCvtY-0000cx-N5 for qemu-devel@nongnu.org; Mon, 01 Nov 2010 11:02:00 -0400 Received: from relay2.suse.de (charybdis-ext.suse.de [195.135.221.2]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.suse.de (Postfix) with ESMTP id 2E16994393; Mon, 1 Nov 2010 16:01:54 +0100 (CET) From: Alexander Graf To: qemu-devel Developers Date: Mon, 1 Nov 2010 16:01:15 +0100 Message-Id: <1288623713-28062-3-git-send-email-agraf@suse.de> X-Mailer: git-send-email 1.6.0.2 In-Reply-To: <1288623713-28062-1-git-send-email-agraf@suse.de> References: <1288623713-28062-1-git-send-email-agraf@suse.de> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4-2.6 Cc: Gerd Hoffmann Subject: [Qemu-devel] [PATCH 02/40] elf: Add notes implementation X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org --- hw/elf_ops.h | 61 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++- hw/loader.c | 7 ++++++ hw/loader.h | 3 ++ 3 files changed, 70 insertions(+), 1 deletions(-) diff --git a/hw/elf_ops.h b/hw/elf_ops.h index 8b63dfc..645d058 100644 --- a/hw/elf_ops.h +++ b/hw/elf_ops.h @@ -189,6 +189,44 @@ static int glue(load_symbols, SZ)(struct elfhdr *ehdr, int fd, int must_swab, return -1; } +static void glue(elf_read_notes, SZ)(uint8_t *data, int data_len, + ElfHandlers *handlers, int must_swab) +{ + uint8_t *p = data; + + while ((ulong)&p[3] < (ulong)&data[data_len]) { + uint32_t *cur = (uint32_t *)p; + uint32_t namesz = cur[0]; + uint32_t descsz = cur[1]; + uint32_t type = cur[2]; + uint8_t *name; + uint8_t *desc; + + p += 3 * sizeof(uint32_t); + + if (must_swab) { + namesz = bswap32(namesz); + descsz = bswap32(descsz); + type = bswap32(type); + } + + namesz = (namesz + 3) & ~3; + descsz = (descsz + 3) & ~3; + + name = p; + p += namesz; + desc = p; + p += descsz; + + if ((ulong)p > (ulong)&data[data_len]) { + break; + } + + handlers->note_fn(handlers->note_opaque, name, namesz, desc, descsz, + type); + } +} + static int glue(load_elf, SZ)(const char *name, int fd, ElfHandlers *handlers, int must_swab, uint64_t *pentry, @@ -252,7 +290,8 @@ static int glue(load_elf, SZ)(const char *name, int fd, total_size = 0; for(i = 0; i < ehdr.e_phnum; i++) { ph = &phdr[i]; - if (ph->p_type == PT_LOAD) { + switch (ph->p_type) { + case PT_LOAD: mem_size = ph->p_memsz; /* XXX: avoid allocating */ data = qemu_mallocz(mem_size); @@ -278,6 +317,26 @@ static int glue(load_elf, SZ)(const char *name, int fd, qemu_free(data); data = NULL; + break; + + case PT_NOTE: + mem_size = ph->p_memsz; + if (!mem_size) { + break; + } + data = qemu_mallocz(mem_size); + if (ph->p_filesz > 0) { + if (lseek(fd, ph->p_offset, SEEK_SET) < 0) + goto fail; + if (read(fd, data, ph->p_filesz) != ph->p_filesz) + goto fail; + } + + glue(elf_read_notes, SZ)(data, ph->p_memsz, handlers, must_swab); + + qemu_free(data); + data = NULL; + break; } } qemu_free(phdr); diff --git a/hw/loader.c b/hw/loader.c index 50b43a0..cb430e0 100644 --- a/hw/loader.c +++ b/hw/loader.c @@ -229,6 +229,11 @@ int load_aout(const char *filename, target_phys_addr_t addr, int max_sz, /* ELF loader */ +static void elf_default_note(void *opaque, uint8_t *name, uint32_t name_len, + uint8_t *desc, uint32_t desc_len, uint32_t type) +{ +} + static uint64_t elf_default_translate(void *opaque, uint64_t addr) { return addr; @@ -237,6 +242,8 @@ static uint64_t elf_default_translate(void *opaque, uint64_t addr) ElfHandlers elf_default_handlers = { .translate_fn = elf_default_translate, .translate_opaque = NULL, + .note_fn = elf_default_note, + .note_opaque = NULL, }; diff --git a/hw/loader.h b/hw/loader.h index 27a2c36..29d5c71 100644 --- a/hw/loader.h +++ b/hw/loader.h @@ -9,6 +9,9 @@ int load_image_targphys(const char *filename, target_phys_addr_t, int max_sz); typedef struct ElfHandlers { uint64_t (*translate_fn)(void *opaque, uint64_t address); void *translate_opaque; + void (*note_fn)(void *opaque, uint8_t *name, uint32_t name_len, + uint8_t *desc, uint32_t desc_len, uint32_t type); + void *note_opaque; } ElfHandlers; extern ElfHandlers elf_default_handlers;