2021-01-02 19:32:25 +00:00
|
|
|
/* Copyright (C) 1999-2021 Free Software Foundation, Inc.
|
1999-12-04 08:00:00 +00:00
|
|
|
This file is part of the GNU C Library.
|
|
|
|
|
|
|
|
The GNU C Library is free software; you can redistribute it and/or
|
2001-07-06 04:58:11 +00:00
|
|
|
modify it under the terms of the GNU Lesser General Public
|
|
|
|
License as published by the Free Software Foundation; either
|
|
|
|
version 2.1 of the License, or (at your option) any later version.
|
1999-12-04 08:00:00 +00:00
|
|
|
|
|
|
|
The GNU C Library is distributed in the hope that it will be useful,
|
|
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
2001-07-06 04:58:11 +00:00
|
|
|
Lesser General Public License for more details.
|
1999-12-04 08:00:00 +00:00
|
|
|
|
2001-07-06 04:58:11 +00:00
|
|
|
You should have received a copy of the GNU Lesser General Public
|
2012-02-09 23:18:22 +00:00
|
|
|
License along with the GNU C Library; if not, see
|
Prefer https to http for gnu.org and fsf.org URLs
Also, change sources.redhat.com to sourceware.org.
This patch was automatically generated by running the following shell
script, which uses GNU sed, and which avoids modifying files imported
from upstream:
sed -ri '
s,(http|ftp)(://(.*\.)?(gnu|fsf|sourceware)\.org($|[^.]|\.[^a-z])),https\2,g
s,(http|ftp)(://(.*\.)?)sources\.redhat\.com($|[^.]|\.[^a-z]),https\2sourceware.org\4,g
' \
$(find $(git ls-files) -prune -type f \
! -name '*.po' \
! -name 'ChangeLog*' \
! -path COPYING ! -path COPYING.LIB \
! -path manual/fdl-1.3.texi ! -path manual/lgpl-2.1.texi \
! -path manual/texinfo.tex ! -path scripts/config.guess \
! -path scripts/config.sub ! -path scripts/install-sh \
! -path scripts/mkinstalldirs ! -path scripts/move-if-change \
! -path INSTALL ! -path locale/programs/charmap-kw.h \
! -path po/libc.pot ! -path sysdeps/gnu/errlist.c \
! '(' -name configure \
-execdir test -f configure.ac -o -f configure.in ';' ')' \
! '(' -name preconfigure \
-execdir test -f preconfigure.ac ';' ')' \
-print)
and then by running 'make dist-prepare' to regenerate files built
from the altered files, and then executing the following to cleanup:
chmod a+x sysdeps/unix/sysv/linux/riscv/configure
# Omit irrelevant whitespace and comment-only changes,
# perhaps from a slightly-different Autoconf version.
git checkout -f \
sysdeps/csky/configure \
sysdeps/hppa/configure \
sysdeps/riscv/configure \
sysdeps/unix/sysv/linux/csky/configure
# Omit changes that caused a pre-commit check to fail like this:
# remote: *** error: sysdeps/powerpc/powerpc64/ppc-mcount.S: trailing lines
git checkout -f \
sysdeps/powerpc/powerpc64/ppc-mcount.S \
sysdeps/unix/sysv/linux/s390/s390-64/syscall.S
# Omit change that caused a pre-commit check to fail like this:
# remote: *** error: sysdeps/sparc/sparc64/multiarch/memcpy-ultra3.S: last line does not end in newline
git checkout -f sysdeps/sparc/sparc64/multiarch/memcpy-ultra3.S
2019-09-07 05:40:42 +00:00
|
|
|
<https://www.gnu.org/licenses/>. */
|
1999-12-04 08:00:00 +00:00
|
|
|
|
2020-12-05 15:01:58 +00:00
|
|
|
#include <elf-read-prop.h>
|
|
|
|
|
1999-12-04 08:00:00 +00:00
|
|
|
/* This code is a heavily simplified version of the readelf program
|
|
|
|
that's part of the current binutils development version. For architectures
|
|
|
|
which need to handle both 32bit and 64bit ELF libraries, this file is
|
|
|
|
included twice for each arch size. */
|
|
|
|
|
2000-05-26 10:23:45 +00:00
|
|
|
/* check_ptr checks that a pointer is in the mmaped file and doesn't
|
|
|
|
point outside it. */
|
2000-11-30 07:31:10 +00:00
|
|
|
#undef check_ptr
|
2000-05-26 10:23:45 +00:00
|
|
|
#define check_ptr(ptr) \
|
|
|
|
do \
|
|
|
|
{ \
|
|
|
|
if ((void *)(ptr) < file_contents \
|
|
|
|
|| (void *)(ptr) > (file_contents+file_length)) \
|
|
|
|
{ \
|
|
|
|
error (0, 0, _("file %s is truncated\n"), file_name); \
|
|
|
|
return 1; \
|
|
|
|
} \
|
|
|
|
} \
|
|
|
|
while (0);
|
2002-08-29 10:42:30 +00:00
|
|
|
|
1999-12-04 08:00:00 +00:00
|
|
|
/* Returns 0 if everything is ok, != 0 in case of error. */
|
|
|
|
int
|
2000-05-26 10:23:45 +00:00
|
|
|
process_elf_file (const char *file_name, const char *lib, int *flag,
|
2020-12-05 15:01:58 +00:00
|
|
|
unsigned int *osversion, unsigned int *isa_level,
|
|
|
|
char **soname, void *file_contents, size_t file_length)
|
1999-12-04 08:00:00 +00:00
|
|
|
{
|
|
|
|
int i;
|
|
|
|
unsigned int j;
|
|
|
|
unsigned int dynamic_addr;
|
|
|
|
size_t dynamic_size;
|
|
|
|
char *program_interpreter;
|
2002-08-29 10:42:30 +00:00
|
|
|
|
1999-12-04 08:00:00 +00:00
|
|
|
ElfW(Ehdr) *elf_header;
|
|
|
|
ElfW(Phdr) *elf_pheader, *segment;
|
|
|
|
ElfW(Dyn) *dynamic_segment, *dyn_entry;
|
2002-08-29 10:42:30 +00:00
|
|
|
char *dynamic_strings;
|
1999-12-04 08:00:00 +00:00
|
|
|
|
|
|
|
elf_header = (ElfW(Ehdr) *) file_contents;
|
Update.
2001-03-12 Jakub Jelinek <jakub@redhat.com>
* csu/Makefile (abi-tag.h): Define OS and version separately, allow
version to be overriden from config.h.
* csu/abi-note.S: Use OS and version separately, include config.h.
* elf/dl-load.c (_dl_osversion): New.
(_dl_map_object_from_fd): Kill some warnings.
(open_verify): Check .note.ABI-tag of the library if present.
* elf/Makefile (CPPFLAGS-dl-load.c): Add -I$(csu-objpfx).
* elf/cache.c (struct cache_entry): Add osversion.
(print_entry): Print osversion.
(print_cache): Pass osversion to it.
(compare): Sort according to osversion.
(save_cache): Set osversion.
(add_to_cache): Add osversion argument.
* sysdeps/generic/ldconfig.h (add_to_cache, process_file,
process_elf_file): Add osversion argument.
* elf/readlib.c (process_file): Likewise.
* sysdeps/generic/readelflib.c (process_elf_file): Likewise.
* sysdeps/unix/sysv/linux/ia64/readelflib.c (process_elf_file,
process_elf32_file, process_elf64_file): Likewise.
* sysdeps/unix/sysv/linux/i386/readelflib.c (process_elf_file,
process_elf32_file, process_elf64_file): Likewise.
* sysdeps/unix/sysv/linux/sparc/readelflib.c (process_elf_file,
process_elf32_file, process_elf64_file): Likewise.
* elf/ldconfig.c (manual_link): Pass it.
(search_dir): Issue diagnostic if two libs with the same soname in
the same directory have different .note.ABI-tag. Record osversion in
dlib_entry and use it from there.
(struct lib_entry): Remove.
(struct dlib_entry): Add osversion.
* sysdeps/generic/dl-cache.c (_dl_load_cache_lookup): Check
osversion.
* sysdeps/generic/dl-cache.h (struct file_entry_new): Replace __unused
field with osversion.
* sysdeps/generic/ldsodefs.h (_dl_osversion): Declare.
* sysdeps/unix/sysv/linux/init-first.c: Include ldsodefs.h.
* sysdeps/unix/sysv/linux/dl-osinfo.h (DL_SYSDEP_OSCHECK): Save kernel
version in _dl_osversion.
* sysdeps/unix/sysv/linux/configure.in: Define __ABI_TAG_VERSION.
* Makerules (build-shlib-helper, build-module-helper): New.
(build-shlib, build-module-helper): Make sure .note.ABI-tag comes
early.
* config.h.in (__ABI_TAG_VERSION): Add.
* elf/dl-minimal.c (__strtoul_internal): Set endptr on return.
* sysdeps/unix/sysv/linux/i386/dl-librecon.h (EXTRA_LD_ENVVARS):
Handle LD_ASSUME_KERNEL.
* sysdeps/unix/sysv/linux/dl-librecon.h: New.
2001-03-16 07:40:05 +00:00
|
|
|
*osversion = 0;
|
1999-12-04 08:00:00 +00:00
|
|
|
|
|
|
|
if (elf_header->e_ident [EI_CLASS] != ElfW (CLASS))
|
|
|
|
{
|
|
|
|
if (opt_verbose)
|
|
|
|
{
|
2002-05-31 00:36:57 +00:00
|
|
|
if (elf_header->e_ident [EI_CLASS] == ELFCLASS32)
|
1999-12-04 08:00:00 +00:00
|
|
|
error (0, 0, _("%s is a 32 bit ELF file.\n"), file_name);
|
2002-05-31 00:36:57 +00:00
|
|
|
else if (elf_header->e_ident [EI_CLASS] == ELFCLASS64)
|
1999-12-04 08:00:00 +00:00
|
|
|
error (0, 0, _("%s is a 64 bit ELF file.\n"), file_name);
|
|
|
|
else
|
|
|
|
error (0, 0, _("Unknown ELFCLASS in file %s.\n"), file_name);
|
|
|
|
}
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (elf_header->e_type != ET_DYN)
|
|
|
|
{
|
|
|
|
error (0, 0, _("%s is not a shared object file (Type: %d).\n"), file_name,
|
|
|
|
elf_header->e_type);
|
|
|
|
return 1;
|
|
|
|
}
|
2002-08-29 10:42:30 +00:00
|
|
|
|
1999-12-04 08:00:00 +00:00
|
|
|
/* Get information from elf program header. */
|
|
|
|
elf_pheader = (ElfW(Phdr) *) (elf_header->e_phoff + file_contents);
|
2000-05-26 10:23:45 +00:00
|
|
|
check_ptr (elf_pheader);
|
1999-12-04 08:00:00 +00:00
|
|
|
|
|
|
|
/* The library is an elf library, now search for soname and
|
|
|
|
libc5/libc6. */
|
|
|
|
*flag = FLAG_ELF;
|
2002-08-29 10:42:30 +00:00
|
|
|
|
2020-12-05 15:01:58 +00:00
|
|
|
/* The default ISA level is 0. */
|
|
|
|
*isa_level = 0;
|
|
|
|
|
1999-12-04 08:00:00 +00:00
|
|
|
dynamic_addr = 0;
|
|
|
|
dynamic_size = 0;
|
|
|
|
program_interpreter = NULL;
|
|
|
|
for (i = 0, segment = elf_pheader;
|
|
|
|
i < elf_header->e_phnum; i++, segment++)
|
|
|
|
{
|
2000-05-26 10:23:45 +00:00
|
|
|
check_ptr (segment);
|
|
|
|
|
1999-12-04 08:00:00 +00:00
|
|
|
switch (segment->p_type)
|
|
|
|
{
|
|
|
|
case PT_DYNAMIC:
|
|
|
|
if (dynamic_addr)
|
|
|
|
error (0, 0, _("more than one dynamic segment\n"));
|
|
|
|
|
|
|
|
dynamic_addr = segment->p_offset;
|
|
|
|
dynamic_size = segment->p_filesz;
|
|
|
|
break;
|
Update.
2001-03-12 Jakub Jelinek <jakub@redhat.com>
* csu/Makefile (abi-tag.h): Define OS and version separately, allow
version to be overriden from config.h.
* csu/abi-note.S: Use OS and version separately, include config.h.
* elf/dl-load.c (_dl_osversion): New.
(_dl_map_object_from_fd): Kill some warnings.
(open_verify): Check .note.ABI-tag of the library if present.
* elf/Makefile (CPPFLAGS-dl-load.c): Add -I$(csu-objpfx).
* elf/cache.c (struct cache_entry): Add osversion.
(print_entry): Print osversion.
(print_cache): Pass osversion to it.
(compare): Sort according to osversion.
(save_cache): Set osversion.
(add_to_cache): Add osversion argument.
* sysdeps/generic/ldconfig.h (add_to_cache, process_file,
process_elf_file): Add osversion argument.
* elf/readlib.c (process_file): Likewise.
* sysdeps/generic/readelflib.c (process_elf_file): Likewise.
* sysdeps/unix/sysv/linux/ia64/readelflib.c (process_elf_file,
process_elf32_file, process_elf64_file): Likewise.
* sysdeps/unix/sysv/linux/i386/readelflib.c (process_elf_file,
process_elf32_file, process_elf64_file): Likewise.
* sysdeps/unix/sysv/linux/sparc/readelflib.c (process_elf_file,
process_elf32_file, process_elf64_file): Likewise.
* elf/ldconfig.c (manual_link): Pass it.
(search_dir): Issue diagnostic if two libs with the same soname in
the same directory have different .note.ABI-tag. Record osversion in
dlib_entry and use it from there.
(struct lib_entry): Remove.
(struct dlib_entry): Add osversion.
* sysdeps/generic/dl-cache.c (_dl_load_cache_lookup): Check
osversion.
* sysdeps/generic/dl-cache.h (struct file_entry_new): Replace __unused
field with osversion.
* sysdeps/generic/ldsodefs.h (_dl_osversion): Declare.
* sysdeps/unix/sysv/linux/init-first.c: Include ldsodefs.h.
* sysdeps/unix/sysv/linux/dl-osinfo.h (DL_SYSDEP_OSCHECK): Save kernel
version in _dl_osversion.
* sysdeps/unix/sysv/linux/configure.in: Define __ABI_TAG_VERSION.
* Makerules (build-shlib-helper, build-module-helper): New.
(build-shlib, build-module-helper): Make sure .note.ABI-tag comes
early.
* config.h.in (__ABI_TAG_VERSION): Add.
* elf/dl-minimal.c (__strtoul_internal): Set endptr on return.
* sysdeps/unix/sysv/linux/i386/dl-librecon.h (EXTRA_LD_ENVVARS):
Handle LD_ASSUME_KERNEL.
* sysdeps/unix/sysv/linux/dl-librecon.h: New.
2001-03-16 07:40:05 +00:00
|
|
|
|
1999-12-04 08:00:00 +00:00
|
|
|
case PT_INTERP:
|
|
|
|
program_interpreter = (char *) (file_contents + segment->p_offset);
|
2000-05-26 10:23:45 +00:00
|
|
|
check_ptr (program_interpreter);
|
1999-12-04 08:00:00 +00:00
|
|
|
|
|
|
|
/* Check if this is enough to classify the binary. */
|
|
|
|
for (j = 0; j < sizeof (interpreters) / sizeof (interpreters [0]);
|
|
|
|
++j)
|
|
|
|
if (strcmp (program_interpreter, interpreters[j].soname) == 0)
|
|
|
|
{
|
|
|
|
*flag = interpreters[j].flag;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
break;
|
Update.
2001-03-12 Jakub Jelinek <jakub@redhat.com>
* csu/Makefile (abi-tag.h): Define OS and version separately, allow
version to be overriden from config.h.
* csu/abi-note.S: Use OS and version separately, include config.h.
* elf/dl-load.c (_dl_osversion): New.
(_dl_map_object_from_fd): Kill some warnings.
(open_verify): Check .note.ABI-tag of the library if present.
* elf/Makefile (CPPFLAGS-dl-load.c): Add -I$(csu-objpfx).
* elf/cache.c (struct cache_entry): Add osversion.
(print_entry): Print osversion.
(print_cache): Pass osversion to it.
(compare): Sort according to osversion.
(save_cache): Set osversion.
(add_to_cache): Add osversion argument.
* sysdeps/generic/ldconfig.h (add_to_cache, process_file,
process_elf_file): Add osversion argument.
* elf/readlib.c (process_file): Likewise.
* sysdeps/generic/readelflib.c (process_elf_file): Likewise.
* sysdeps/unix/sysv/linux/ia64/readelflib.c (process_elf_file,
process_elf32_file, process_elf64_file): Likewise.
* sysdeps/unix/sysv/linux/i386/readelflib.c (process_elf_file,
process_elf32_file, process_elf64_file): Likewise.
* sysdeps/unix/sysv/linux/sparc/readelflib.c (process_elf_file,
process_elf32_file, process_elf64_file): Likewise.
* elf/ldconfig.c (manual_link): Pass it.
(search_dir): Issue diagnostic if two libs with the same soname in
the same directory have different .note.ABI-tag. Record osversion in
dlib_entry and use it from there.
(struct lib_entry): Remove.
(struct dlib_entry): Add osversion.
* sysdeps/generic/dl-cache.c (_dl_load_cache_lookup): Check
osversion.
* sysdeps/generic/dl-cache.h (struct file_entry_new): Replace __unused
field with osversion.
* sysdeps/generic/ldsodefs.h (_dl_osversion): Declare.
* sysdeps/unix/sysv/linux/init-first.c: Include ldsodefs.h.
* sysdeps/unix/sysv/linux/dl-osinfo.h (DL_SYSDEP_OSCHECK): Save kernel
version in _dl_osversion.
* sysdeps/unix/sysv/linux/configure.in: Define __ABI_TAG_VERSION.
* Makerules (build-shlib-helper, build-module-helper): New.
(build-shlib, build-module-helper): Make sure .note.ABI-tag comes
early.
* config.h.in (__ABI_TAG_VERSION): Add.
* elf/dl-minimal.c (__strtoul_internal): Set endptr on return.
* sysdeps/unix/sysv/linux/i386/dl-librecon.h (EXTRA_LD_ENVVARS):
Handle LD_ASSUME_KERNEL.
* sysdeps/unix/sysv/linux/dl-librecon.h: New.
2001-03-16 07:40:05 +00:00
|
|
|
|
|
|
|
case PT_NOTE:
|
2007-06-30 17:01:43 +00:00
|
|
|
if (!*osversion && segment->p_filesz >= 32 && segment->p_align >= 4)
|
Update.
2001-03-12 Jakub Jelinek <jakub@redhat.com>
* csu/Makefile (abi-tag.h): Define OS and version separately, allow
version to be overriden from config.h.
* csu/abi-note.S: Use OS and version separately, include config.h.
* elf/dl-load.c (_dl_osversion): New.
(_dl_map_object_from_fd): Kill some warnings.
(open_verify): Check .note.ABI-tag of the library if present.
* elf/Makefile (CPPFLAGS-dl-load.c): Add -I$(csu-objpfx).
* elf/cache.c (struct cache_entry): Add osversion.
(print_entry): Print osversion.
(print_cache): Pass osversion to it.
(compare): Sort according to osversion.
(save_cache): Set osversion.
(add_to_cache): Add osversion argument.
* sysdeps/generic/ldconfig.h (add_to_cache, process_file,
process_elf_file): Add osversion argument.
* elf/readlib.c (process_file): Likewise.
* sysdeps/generic/readelflib.c (process_elf_file): Likewise.
* sysdeps/unix/sysv/linux/ia64/readelflib.c (process_elf_file,
process_elf32_file, process_elf64_file): Likewise.
* sysdeps/unix/sysv/linux/i386/readelflib.c (process_elf_file,
process_elf32_file, process_elf64_file): Likewise.
* sysdeps/unix/sysv/linux/sparc/readelflib.c (process_elf_file,
process_elf32_file, process_elf64_file): Likewise.
* elf/ldconfig.c (manual_link): Pass it.
(search_dir): Issue diagnostic if two libs with the same soname in
the same directory have different .note.ABI-tag. Record osversion in
dlib_entry and use it from there.
(struct lib_entry): Remove.
(struct dlib_entry): Add osversion.
* sysdeps/generic/dl-cache.c (_dl_load_cache_lookup): Check
osversion.
* sysdeps/generic/dl-cache.h (struct file_entry_new): Replace __unused
field with osversion.
* sysdeps/generic/ldsodefs.h (_dl_osversion): Declare.
* sysdeps/unix/sysv/linux/init-first.c: Include ldsodefs.h.
* sysdeps/unix/sysv/linux/dl-osinfo.h (DL_SYSDEP_OSCHECK): Save kernel
version in _dl_osversion.
* sysdeps/unix/sysv/linux/configure.in: Define __ABI_TAG_VERSION.
* Makerules (build-shlib-helper, build-module-helper): New.
(build-shlib, build-module-helper): Make sure .note.ABI-tag comes
early.
* config.h.in (__ABI_TAG_VERSION): Add.
* elf/dl-minimal.c (__strtoul_internal): Set endptr on return.
* sysdeps/unix/sysv/linux/i386/dl-librecon.h (EXTRA_LD_ENVVARS):
Handle LD_ASSUME_KERNEL.
* sysdeps/unix/sysv/linux/dl-librecon.h: New.
2001-03-16 07:40:05 +00:00
|
|
|
{
|
|
|
|
ElfW(Word) *abi_note = (ElfW(Word) *) (file_contents
|
|
|
|
+ segment->p_offset);
|
2007-06-30 17:01:43 +00:00
|
|
|
ElfW(Addr) size = segment->p_filesz;
|
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.
2017-11-28 17:56:47 +00:00
|
|
|
/* NB: Some PT_NOTE segment may have alignment value of 0
|
|
|
|
or 1. gABI specifies that PT_NOTE segments should be
|
|
|
|
aligned to 4 bytes in 32-bit objects and to 8 bytes in
|
|
|
|
64-bit objects. As a Linux extension, we also support
|
|
|
|
4 byte alignment in 64-bit objects. If p_align is less
|
|
|
|
than 4, we treate alignment as 4 bytes since some note
|
|
|
|
segments have 0 or 1 byte alignment. */
|
|
|
|
ElfW(Addr) align = segment->p_align;
|
|
|
|
if (align < 4)
|
|
|
|
align = 4;
|
|
|
|
else if (align != 4 && align != 8)
|
|
|
|
continue;
|
2007-06-30 17:01:43 +00:00
|
|
|
|
|
|
|
while (abi_note [0] != 4 || abi_note [1] != 16
|
|
|
|
|| abi_note [2] != 1
|
|
|
|
|| memcmp (abi_note + 3, "GNU", 4) != 0)
|
|
|
|
{
|
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.
2017-11-28 17:56:47 +00:00
|
|
|
ElfW(Addr) note_size
|
|
|
|
= ELF_NOTE_NEXT_OFFSET (abi_note[0], abi_note[1],
|
|
|
|
align);
|
2007-06-30 17:01:43 +00:00
|
|
|
|
|
|
|
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;
|
|
|
|
|
Break some lines before not after operators.
The GNU Coding Standards specify that line breaks in expressions
should go before an operator, not after one. This patch fixes various
code to do this. It only changes code that appears to be mostly
following GNU style anyway, not files and directories with
substantially different formatting. It is not exhaustive even for
files using GNU style (for example, changes to sysdeps files are
deferred for subsequent cleanups). Some files changed are shared with
gnulib, but most are specific to glibc. Changes were made manually,
with places to change found by grep (so some cases, e.g. where the
operator was followed by a comment at end of line, are particularly
liable to have been missed by grep, but I did include cases where the
operator was followed by backslash-newline).
This patch generally does not attempt to address other coding style
issues in the expressions changed (for example, missing spaces before
'(', or lack of parentheses to ensure indentation of continuation
lines properly reflects operator precedence).
Tested for x86_64, and with build-many-glibcs.py.
* benchtests/bench-memmem.c (simple_memmem): Break lines before
rather than after operators.
* benchtests/bench-skeleton.c (TIMESPEC_AFTER): Likewise.
* crypt/md5.c (md5_finish_ctx): Likewise.
* crypt/sha256.c (__sha256_finish_ctx): Likewise.
* crypt/sha512.c (__sha512_finish_ctx): Likewise.
* elf/cache.c (load_aux_cache): Likewise.
* elf/dl-load.c (open_verify): Likewise.
* elf/get-dynamic-info.h (elf_get_dynamic_info): Likewise.
* elf/readelflib.c (process_elf_file): Likewise.
* elf/rtld.c (dl_main): Likewise.
* elf/sprof.c (generate_call_graph): Likewise.
* hurd/ctty-input.c (_hurd_ctty_input): Likewise.
* hurd/ctty-output.c (_hurd_ctty_output): Likewise.
* hurd/dtable.c (reauth_dtable): Likewise.
* hurd/getdport.c (__getdport): Likewise.
* hurd/hurd/signal.h (_hurd_interrupted_rpc_timeout): Likewise.
* hurd/hurd/sigpreempt.h (HURD_PREEMPT_SIGNAL_P): Likewise.
* hurd/hurdfault.c (_hurdsig_fault_catch_exception_raise):
Likewise.
* hurd/hurdioctl.c (fioctl): Likewise.
* hurd/hurdselect.c (_hurd_select): Likewise.
* hurd/hurdsig.c (_hurdsig_abort_rpcs): Likewise.
(STOPSIGS): Likewise.
* hurd/hurdstartup.c (_hurd_startup): Likewise.
* hurd/intr-msg.c (_hurd_intr_rpc_mach_msg): Likewise.
* hurd/lookup-retry.c (__hurd_file_name_lookup_retry): Likewise.
* hurd/msgportdemux.c (msgport_server): Likewise.
* hurd/setauth.c (_hurd_setauth): Likewise.
* include/features.h (__GLIBC_USE_DEPRECATED_SCANF): Likewise.
* libio/libioP.h [IO_DEBUG] (CHECK_FILE): Likewise.
* locale/programs/ld-ctype.c (set_class_defaults): Likewise.
* localedata/tests-mbwc/tst_swscanf.c (tst_swscanf): Likewise.
* login/tst-utmp.c (do_check): Likewise.
(simulate_login): Likewise.
* mach/lowlevellock.h (lll_lock): Likewise.
(lll_trylock): Likewise.
* math/test-fenv.c (ALL_EXC): Likewise.
* math/test-fenvinline.c (ALL_EXC): Likewise.
* misc/sys/cdefs.h (__attribute_deprecated_msg__): Likewise.
* nis/nis_call.c (__do_niscall3): Likewise.
* nis/nis_callback.c (cb_prog_1): Likewise.
* nis/nis_defaults.c (searchaccess): Likewise.
* nis/nis_findserv.c (__nis_findfastest_with_timeout): Likewise.
* nis/nis_ismember.c (internal_ismember): Likewise.
* nis/nis_local_names.c (nis_local_principal): Likewise.
* nis/nss_nis/nis-rpc.c (_nss_nis_getrpcbyname_r): Likewise.
* nis/nss_nisplus/nisplus-netgrp.c (_nss_nisplus_getnetgrent_r):
Likewise.
* nis/ypclnt.c (yp_match): Likewise.
(yp_first): Likewise.
(yp_next): Likewise.
(yp_master): Likewise.
(yp_order): Likewise.
* nscd/hstcache.c (cache_addhst): Likewise.
* nscd/initgrcache.c (addinitgroupsX): Likewise.
* nss/nss_compat/compat-pwd.c (copy_pwd_changes): Likewise.
(internal_getpwuid_r): Likewise.
* nss/nss_compat/compat-spwd.c (copy_spwd_changes): Likewise.
* posix/glob.h (__GLOB_FLAGS): Likewise.
* posix/regcomp.c (peek_token): Likewise.
(peek_token_bracket): Likewise.
(parse_expression): Likewise.
* posix/regexec.c (sift_states_iter_mb): Likewise.
(check_node_accept_bytes): Likewise.
* posix/tst-spawn3.c (do_test): Likewise.
* posix/wordexp-test.c (testit): Likewise.
* posix/wordexp.c (parse_tilde): Likewise.
(exec_comm): Likewise.
* posix/wordexp.h (__WRDE_FLAGS): Likewise.
* resource/vtimes.c (TIMEVAL_TO_VTIMES): Likewise.
* setjmp/sigjmp.c (__sigjmp_save): Likewise.
* stdio-common/printf_fp.c (__printf_fp_l): Likewise.
* stdio-common/tst-fileno.c (do_test): Likewise.
* stdio-common/vfprintf-internal.c (vfprintf): Likewise.
* stdlib/strfmon_l.c (__vstrfmon_l_internal): Likewise.
* stdlib/strtod_l.c (round_and_return): Likewise.
(____STRTOF_INTERNAL): Likewise.
* stdlib/tst-strfrom.h (TEST_STRFROM): Likewise.
* string/strcspn.c (STRCSPN): Likewise.
* string/test-memmem.c (simple_memmem): Likewise.
* termios/tcsetattr.c (tcsetattr): Likewise.
* time/alt_digit.c (_nl_parse_alt_digit): Likewise.
* time/asctime.c (asctime_internal): Likewise.
* time/strptime_l.c (__strptime_internal): Likewise.
* time/sys/time.h (timercmp): Likewise.
* time/tzfile.c (__tzfile_compute): Likewise.
2019-02-22 01:32:36 +00:00
|
|
|
*osversion = ((abi_note [4] << 24)
|
|
|
|
| ((abi_note [5] & 0xff) << 16)
|
|
|
|
| ((abi_note [6] & 0xff) << 8)
|
|
|
|
| (abi_note [7] & 0xff));
|
Update.
2001-03-12 Jakub Jelinek <jakub@redhat.com>
* csu/Makefile (abi-tag.h): Define OS and version separately, allow
version to be overriden from config.h.
* csu/abi-note.S: Use OS and version separately, include config.h.
* elf/dl-load.c (_dl_osversion): New.
(_dl_map_object_from_fd): Kill some warnings.
(open_verify): Check .note.ABI-tag of the library if present.
* elf/Makefile (CPPFLAGS-dl-load.c): Add -I$(csu-objpfx).
* elf/cache.c (struct cache_entry): Add osversion.
(print_entry): Print osversion.
(print_cache): Pass osversion to it.
(compare): Sort according to osversion.
(save_cache): Set osversion.
(add_to_cache): Add osversion argument.
* sysdeps/generic/ldconfig.h (add_to_cache, process_file,
process_elf_file): Add osversion argument.
* elf/readlib.c (process_file): Likewise.
* sysdeps/generic/readelflib.c (process_elf_file): Likewise.
* sysdeps/unix/sysv/linux/ia64/readelflib.c (process_elf_file,
process_elf32_file, process_elf64_file): Likewise.
* sysdeps/unix/sysv/linux/i386/readelflib.c (process_elf_file,
process_elf32_file, process_elf64_file): Likewise.
* sysdeps/unix/sysv/linux/sparc/readelflib.c (process_elf_file,
process_elf32_file, process_elf64_file): Likewise.
* elf/ldconfig.c (manual_link): Pass it.
(search_dir): Issue diagnostic if two libs with the same soname in
the same directory have different .note.ABI-tag. Record osversion in
dlib_entry and use it from there.
(struct lib_entry): Remove.
(struct dlib_entry): Add osversion.
* sysdeps/generic/dl-cache.c (_dl_load_cache_lookup): Check
osversion.
* sysdeps/generic/dl-cache.h (struct file_entry_new): Replace __unused
field with osversion.
* sysdeps/generic/ldsodefs.h (_dl_osversion): Declare.
* sysdeps/unix/sysv/linux/init-first.c: Include ldsodefs.h.
* sysdeps/unix/sysv/linux/dl-osinfo.h (DL_SYSDEP_OSCHECK): Save kernel
version in _dl_osversion.
* sysdeps/unix/sysv/linux/configure.in: Define __ABI_TAG_VERSION.
* Makerules (build-shlib-helper, build-module-helper): New.
(build-shlib, build-module-helper): Make sure .note.ABI-tag comes
early.
* config.h.in (__ABI_TAG_VERSION): Add.
* elf/dl-minimal.c (__strtoul_internal): Set endptr on return.
* sysdeps/unix/sysv/linux/i386/dl-librecon.h (EXTRA_LD_ENVVARS):
Handle LD_ASSUME_KERNEL.
* sysdeps/unix/sysv/linux/dl-librecon.h: New.
2001-03-16 07:40:05 +00:00
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
2020-12-05 15:01:58 +00:00
|
|
|
case PT_GNU_PROPERTY:
|
|
|
|
/* The NT_GNU_PROPERTY_TYPE_0 note must be aligned to 4 bytes
|
|
|
|
in 32-bit objects and to 8 bytes in 64-bit objects. Skip
|
|
|
|
notes with incorrect alignment. */
|
|
|
|
if (segment->p_align == (__ELF_NATIVE_CLASS / 8))
|
|
|
|
{
|
|
|
|
const ElfW(Nhdr) *note = (const void *) (file_contents
|
|
|
|
+ segment->p_offset);
|
|
|
|
const ElfW(Addr) size = segment->p_filesz;
|
|
|
|
const ElfW(Addr) align = segment->p_align;
|
|
|
|
|
|
|
|
const ElfW(Addr) start = (ElfW(Addr)) (uintptr_t) note;
|
|
|
|
unsigned int last_type = 0;
|
|
|
|
|
|
|
|
while ((ElfW(Addr)) (uintptr_t) (note + 1) - start < size)
|
|
|
|
{
|
|
|
|
/* Find the NT_GNU_PROPERTY_TYPE_0 note. */
|
|
|
|
if (note->n_namesz == 4
|
|
|
|
&& note->n_type == NT_GNU_PROPERTY_TYPE_0
|
|
|
|
&& memcmp (note + 1, "GNU", 4) == 0)
|
|
|
|
{
|
|
|
|
/* Check for invalid property. */
|
|
|
|
if (note->n_descsz < 8
|
|
|
|
|| (note->n_descsz % sizeof (ElfW(Addr))) != 0)
|
|
|
|
goto done;
|
|
|
|
|
|
|
|
/* Start and end of property array. */
|
|
|
|
unsigned char *ptr = (unsigned char *) (note + 1) + 4;
|
|
|
|
unsigned char *ptr_end = ptr + note->n_descsz;
|
|
|
|
|
|
|
|
do
|
|
|
|
{
|
|
|
|
unsigned int type = *(unsigned int *) ptr;
|
|
|
|
unsigned int datasz = *(unsigned int *) (ptr + 4);
|
|
|
|
|
|
|
|
/* Property type must be in ascending order. */
|
|
|
|
if (type < last_type)
|
|
|
|
goto done;
|
|
|
|
|
|
|
|
ptr += 8;
|
|
|
|
if ((ptr + datasz) > ptr_end)
|
|
|
|
goto done;
|
|
|
|
|
|
|
|
last_type = type;
|
|
|
|
|
|
|
|
/* Target specific property processing.
|
|
|
|
Return value:
|
|
|
|
false: Continue processing the properties.
|
|
|
|
true : Stop processing the properties.
|
|
|
|
*/
|
|
|
|
if (read_gnu_property (isa_level, type,
|
|
|
|
datasz, ptr))
|
|
|
|
goto done;
|
|
|
|
|
|
|
|
/* Check the next property item. */
|
|
|
|
ptr += ALIGN_UP (datasz, sizeof (ElfW(Addr)));
|
|
|
|
}
|
|
|
|
while ((ptr_end - ptr) >= 8);
|
|
|
|
|
|
|
|
/* Only handle one NT_GNU_PROPERTY_TYPE_0. */
|
|
|
|
goto done;
|
|
|
|
}
|
|
|
|
|
|
|
|
note = ((const void *) note
|
|
|
|
+ ELF_NOTE_NEXT_OFFSET (note->n_namesz,
|
|
|
|
note->n_descsz,
|
|
|
|
align));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
done:
|
|
|
|
break;
|
|
|
|
|
1999-12-04 08:00:00 +00:00
|
|
|
default:
|
|
|
|
break;
|
|
|
|
}
|
2002-08-29 10:42:30 +00:00
|
|
|
|
1999-12-04 08:00:00 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/* Now we can read the dynamic sections. */
|
|
|
|
if (dynamic_size == 0)
|
|
|
|
return 1;
|
2002-08-29 10:42:30 +00:00
|
|
|
|
1999-12-04 08:00:00 +00:00
|
|
|
dynamic_segment = (ElfW(Dyn) *) (file_contents + dynamic_addr);
|
2000-05-26 10:23:45 +00:00
|
|
|
check_ptr (dynamic_segment);
|
1999-12-04 08:00:00 +00:00
|
|
|
|
|
|
|
/* Find the string table. */
|
|
|
|
dynamic_strings = NULL;
|
|
|
|
for (dyn_entry = dynamic_segment; dyn_entry->d_tag != DT_NULL;
|
|
|
|
++dyn_entry)
|
|
|
|
{
|
2000-05-26 10:23:45 +00:00
|
|
|
check_ptr (dyn_entry);
|
1999-12-04 08:00:00 +00:00
|
|
|
if (dyn_entry->d_tag == DT_STRTAB)
|
|
|
|
{
|
2019-10-09 15:46:47 +00:00
|
|
|
/* Find the file offset of the segment containing the dynamic
|
|
|
|
string table. */
|
|
|
|
ElfW(Off) loadoff = -1;
|
|
|
|
for (i = 0, segment = elf_pheader;
|
|
|
|
i < elf_header->e_phnum; i++, segment++)
|
|
|
|
{
|
|
|
|
if (segment->p_type == PT_LOAD
|
|
|
|
&& dyn_entry->d_un.d_val >= segment->p_vaddr
|
|
|
|
&& (dyn_entry->d_un.d_val - segment->p_vaddr
|
|
|
|
< segment->p_filesz))
|
|
|
|
{
|
|
|
|
loadoff = segment->p_vaddr - segment->p_offset;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (loadoff == (ElfW(Off)) -1)
|
|
|
|
{
|
|
|
|
/* Very strange. */
|
|
|
|
loadoff = 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
dynamic_strings = (char *) (file_contents + dyn_entry->d_un.d_val
|
|
|
|
- loadoff);
|
2000-05-26 10:23:45 +00:00
|
|
|
check_ptr (dynamic_strings);
|
1999-12-04 08:00:00 +00:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if (dynamic_strings == NULL)
|
|
|
|
return 1;
|
|
|
|
|
|
|
|
/* Now read the DT_NEEDED and DT_SONAME entries. */
|
|
|
|
for (dyn_entry = dynamic_segment; dyn_entry->d_tag != DT_NULL;
|
|
|
|
++dyn_entry)
|
|
|
|
{
|
|
|
|
if (dyn_entry->d_tag == DT_NEEDED || dyn_entry->d_tag == DT_SONAME)
|
|
|
|
{
|
|
|
|
char *name = dynamic_strings + dyn_entry->d_un.d_val;
|
2000-05-26 10:23:45 +00:00
|
|
|
check_ptr (name);
|
1999-12-04 08:00:00 +00:00
|
|
|
|
|
|
|
if (dyn_entry->d_tag == DT_NEEDED)
|
|
|
|
{
|
2002-08-29 10:42:30 +00:00
|
|
|
|
1999-12-04 08:00:00 +00:00
|
|
|
if (*flag == FLAG_ELF)
|
|
|
|
{
|
|
|
|
/* Check if this is enough to classify the binary. */
|
|
|
|
for (j = 0;
|
|
|
|
j < sizeof (known_libs) / sizeof (known_libs [0]);
|
|
|
|
++j)
|
|
|
|
if (strcmp (name, known_libs [j].soname) == 0)
|
|
|
|
{
|
|
|
|
*flag = known_libs [j].flag;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
else if (dyn_entry->d_tag == DT_SONAME)
|
|
|
|
*soname = xstrdup (name);
|
2002-08-29 10:42:30 +00:00
|
|
|
|
1999-12-04 08:00:00 +00:00
|
|
|
/* Do we have everything we need? */
|
|
|
|
if (*soname && *flag != FLAG_ELF)
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|