diff options
| author | Florian Weimer <fweimer@redhat.com> | 2022-08-24 17:35:36 +0200 |
|---|---|---|
| committer | Florian Weimer <fweimer@redhat.com> | 2022-08-24 17:35:57 +0200 |
| commit | 6f85dbf102ad7982409ba0fe96886caeb6389fef (patch) | |
| tree | 430440c34027af70ebf69884a6b4541d7055c3d2 /elf/dl-load.c | |
| parent | 06e4033c83276ed349d315bfbf651be56c3e2954 (diff) | |
| download | glibc-6f85dbf102ad7982409ba0fe96886caeb6389fef.tar.gz glibc-6f85dbf102ad7982409ba0fe96886caeb6389fef.tar.xz glibc-6f85dbf102ad7982409ba0fe96886caeb6389fef.zip | |
Detect ld.so and libc.so version inconsistency during startup
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>
Diffstat (limited to 'elf/dl-load.c')
| -rw-r--r-- | elf/dl-load.c | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/elf/dl-load.c b/elf/dl-load.c index 1ad0868dad..00e08b5500 100644 --- a/elf/dl-load.c +++ b/elf/dl-load.c @@ -31,7 +31,6 @@ #include <sys/param.h> #include <sys/stat.h> #include <sys/types.h> -#include <gnu/lib-names.h> /* Type for the buffer we put the ELF header and hopefully the program header. This buffer does not really have to be too large. In most @@ -1466,14 +1465,6 @@ cannot enable executable stack as shared object requires"); add_name_to_object (l, ((const char *) D_PTR (l, l_info[DT_STRTAB]) + l->l_info[DT_SONAME]->d_un.d_val)); - /* If we have newly loaded libc.so, update the namespace - description. */ - if (GL(dl_ns)[nsid].libc_map == NULL - && l->l_info[DT_SONAME] != NULL - && strcmp (((const char *) D_PTR (l, l_info[DT_STRTAB]) - + l->l_info[DT_SONAME]->d_un.d_val), LIBC_SO) == 0) - GL(dl_ns)[nsid].libc_map = l; - /* _dl_close can only eventually undo the module ID assignment (via remove_slotinfo) if this function returns a pointer to a link map. Therefore, delay this step until all possibilities for |