diff options
| author | H.J. Lu <hjl.tools@gmail.com> | 2017-11-28 09:56:47 -0800 |
|---|---|---|
| committer | H.J. Lu <hjl.tools@gmail.com> | 2017-11-28 09:57:00 -0800 |
| commit | 8d81ce0c6d6ca923571e8b2bac132929f9a02973 (patch) | |
| tree | 084029fbe3af20f86d408a1eb07c424357d48d51 /include | |
| parent | 313ba4630f5f891af22bea9bdf9d9f3c88e49aee (diff) | |
| download | glibc-8d81ce0c6d6ca923571e8b2bac132929f9a02973.zip glibc-8d81ce0c6d6ca923571e8b2bac132929f9a02973.tar.gz glibc-8d81ce0c6d6ca923571e8b2bac132929f9a02973.tar.bz2 | |
Properly compute offsets of note descriptor and next note [BZ #22370]
A note header has 3 4-bytes fields, followed by note name and note
descriptor. According to gABI, in a note entry, the note name field,
not note name size, is padded for the note descriptor. And the note
descriptor field, not note descriptor size, is padded for the next
note entry. Notes are aligned to 4 bytes in 32-bit objects and 8 bytes
in 64-bit objects.
For all GNU notes, the name is "GNU" which is 4 bytes. They have the
same format in the first 16 bytes in both 32-bit and 64-bit objects.
They differ by note descriptor size and note type. So far, .note.ABI-tag
and .note.gnu.build-id notes are always aligned to 4 bytes. The exsting
codes compute the note size by aligning the note name size and note
descriptor size to 4 bytes. It happens to produce the same value as
the actual note size by luck since the name size is 4 and offset of the
note descriptor is 16. But it will produce the wrong size when note
alignment is 8 bytes in 64-bit objects.
This patch defines ELF_NOTE_DESC_OFFSET and ELF_NOTE_NEXT_OFFSET to
properly compute offsets of note descriptor and next note. It uses
alignment of PT_NOTE segment to support both 4-byte and 8-byte note
alignments in 64-bit objects. To handle PT_NOTE segments with
incorrect alignment, which may lead to an infinite loop, if segment
alignment is less than 4, we treate alignment as 4 bytes since some
note segments have 0 or 1 byte alignment.
[BZ #22370]
* elf/dl-hwcaps.c (ROUND): Removed.
(_dl_important_hwcaps): Replace ROUND with ELF_NOTE_DESC_OFFSET
and ELF_NOTE_NEXT_OFFSET.
* elf/dl-load.c (ROUND): Removed.
(open_verify): Replace ROUND with ELF_NOTE_NEXT_OFFSET.
* elf/readelflib.c (ROUND): Removed.
(process_elf_file): Replace ROUND with ELF_NOTE_NEXT_OFFSET.
* include/elf.h [!_ISOMAC]: Include <libc-pointer-arith.h>.
[!_ISOMAC] (ELF_NOTE_DESC_OFFSET): New.
[!_ISOMAC] (ELF_NOTE_NEXT_OFFSET): Likewise.
Diffstat (limited to 'include')
| -rw-r--r-- | include/elf.h | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/include/elf.h b/include/elf.h index f06a33f..ab76aaf 100644 --- a/include/elf.h +++ b/include/elf.h @@ -1,7 +1,19 @@ #ifndef _ELF_H #include <elf/elf.h> -# ifndef _ISOMAC +#ifndef _ISOMAC + +# include <libc-pointer-arith.h> + +/* Compute the offset of the note descriptor from size of note entry's + owner string and note alignment. */ +# define ELF_NOTE_DESC_OFFSET(namesz, align) \ + ALIGN_UP (sizeof (ElfW(Nhdr)) + (namesz), (align)) + +/* Compute the offset of the next note entry from size of note entry's + owner string, size of the note descriptor and note alignment. */ +# define ELF_NOTE_NEXT_OFFSET(namesz, descsz, align) \ + ALIGN_UP (ELF_NOTE_DESC_OFFSET ((namesz), (align)) + (descsz), (align)) /* Some information which is not meant for the public and therefore not in <elf.h>. */ @@ -13,5 +25,5 @@ (DF_1_NOW | DF_1_NODELETE | DF_1_INITFIRST | DF_1_NOOPEN \ | DF_1_ORIGIN | DF_1_NODEFLIB) -# endif /* !_ISOMAC */ +#endif /* !_ISOMAC */ #endif /* elf.h */ |