6f85dbf102
The files NEWS, include/link.h, and sysdeps/generic/ldsodefs.h contribute to the version fingerprint used for detection. The fingerprint can be further refined using the --with-extra-version-id configure argument. _dl_call_libc_early_init is replaced with _dl_lookup_libc_early_init. The new function is used store a pointer to libc.so's __libc_early_init function in the libc_map_early_init member of the ld.so namespace structure. This function pointer can then be called directly, so the separate invocation function is no longer needed. The versioned symbol lookup needs the symbol versioning data structures, so the initialization of libc_map and libc_map_early_init is now done from _dl_check_map_versions, after this information becomes available. (_dl_map_object_from_fd does not set this up in time, so the initialization code had to be moved from there.) This means that the separate initialization code can be removed from dl_main because _dl_check_map_versions covers all maps, including the initial executable loaded by the kernel. The lookup still happens before relocation and the invocation of IFUNC resolvers, so IFUNC resolvers are protected from ABI mismatch. The __libc_early_init function pointer is not protected because so little code runs between the pointer write and the invocation (only dynamic linker code and IFUNC resolvers). Reviewed-by: Carlos O'Donell <carlos@redhat.com>
37 lines
1.4 KiB
C
37 lines
1.4 KiB
C
/* Find the address of the __libc_early_init function.
|
|
Copyright (C) 2020-2022 Free Software Foundation, Inc.
|
|
This file is part of the GNU C Library.
|
|
|
|
The GNU C Library is free software; you can redistribute it and/or
|
|
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.
|
|
|
|
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
|
|
Lesser General Public License for more details.
|
|
|
|
You should have received a copy of the GNU Lesser General Public
|
|
License along with the GNU C Library; if not, see
|
|
<https://www.gnu.org/licenses/>. */
|
|
|
|
#include <ldsodefs.h>
|
|
#include <libc-early-init.h>
|
|
#include <link.h>
|
|
#include <stddef.h>
|
|
|
|
__typeof (__libc_early_init) *
|
|
_dl_lookup_libc_early_init (struct link_map *libc_map)
|
|
{
|
|
const ElfW(Sym) *sym
|
|
= _dl_lookup_direct (libc_map, LIBC_EARLY_INIT_NAME_STRING,
|
|
LIBC_EARLY_INIT_GNU_HASH,
|
|
"GLIBC_PRIVATE",
|
|
0x0963cf85); /* _dl_elf_hash output. */
|
|
if (sym == NULL)
|
|
_dl_signal_error (0, libc_map->l_name, NULL, "\
|
|
ld.so/libc.so mismatch detected (upgrade in progress?)");
|
|
return DL_SYMBOL_ADDRESS (libc_map, sym);
|
|
}
|