diff options
| author | Ulrich Drepper <drepper@redhat.com> | 2007-06-30 17:01:43 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 2007-06-30 17:01:43 +0000 |
| commit | 0e508a6e4a0a80a4bcf625282d41f282c38757b3 (patch) | |
| tree | 08573a3003879c8388833f67065dbd8d017306cf | |
| parent | 2f6773b574652038ce4455fffbfc5931725dbc13 (diff) | |
| download | glibc-0e508a6e4a0a80a4bcf625282d41f282c38757b3.tar.gz glibc-0e508a6e4a0a80a4bcf625282d41f282c38757b3.tar.xz glibc-0e508a6e4a0a80a4bcf625282d41f282c38757b3.zip | |
* elf/dl-load.c (open_verify): Find .note.ABI-tag notes even
in PT_NOTE segments with multiple notes. * elf/readelflib.c (process_elf_file): Likewise.
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | elf/readelflib.c | 37 |
2 files changed, 35 insertions, 8 deletions
diff --git a/ChangeLog b/ChangeLog index fb25d0c15e..5af1cf345a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2007-06-29 Jakub Jelinek <jakub@redhat.com> + + * elf/dl-load.c (open_verify): Find .note.ABI-tag notes even + in PT_NOTE segments with multiple notes. + * elf/readelflib.c (process_elf_file): Likewise. + 2007-06-22 Ulrich Drepper <drepper@redhat.com> * nis/nis_domain_of.c (__nis_domain_of): Make the code a bit more diff --git a/elf/readelflib.c b/elf/readelflib.c index 26444ad6b2..ea92d89b20 100644 --- a/elf/readelflib.c +++ b/elf/readelflib.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1999, 2000, 2001, 2002 Free Software Foundation, Inc. +/* Copyright (C) 1999, 2000, 2001, 2002, 2007 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Andreas Jaeger <aj@suse.de>, 1999 and Jakub Jelinek <jakub@redhat.com>, 1999. @@ -127,16 +127,37 @@ process_elf_file (const char *file_name, const char *lib, int *flag, break; case PT_NOTE: - if (!*osversion && segment->p_filesz == 32 && segment->p_align >= 4) + if (!*osversion && segment->p_filesz >= 32 && segment->p_align >= 4) { ElfW(Word) *abi_note = (ElfW(Word) *) (file_contents + segment->p_offset); - if (abi_note [0] == 4 && abi_note [1] == 16 && abi_note [2] == 1 - && memcmp (abi_note + 3, "GNU", 4) == 0) - *osversion = (abi_note [4] << 24) | - ((abi_note [5] & 0xff) << 16) | - ((abi_note [6] & 0xff) << 8) | - (abi_note [7] & 0xff); + ElfW(Addr) size = segment->p_filesz; + + while (abi_note [0] != 4 || abi_note [1] != 16 + || abi_note [2] != 1 + || memcmp (abi_note + 3, "GNU", 4) != 0) + { +#define ROUND(len) (((len) + sizeof (ElfW(Word)) - 1) & -sizeof (ElfW(Word))) + ElfW(Addr) note_size = 3 * sizeof (ElfW(Word)) + + ROUND (abi_note[0]) + + ROUND (abi_note[1]); + + if (size - 32 < note_size || note_size == 0) + { + size = 0; + break; + } + size -= note_size; + abi_note = (void *) abi_note + note_size; + } + + if (size == 0) + break; + + *osversion = (abi_note [4] << 24) | + ((abi_note [5] & 0xff) << 16) | + ((abi_note [6] & 0xff) << 8) | + (abi_note [7] & 0xff); } break; |