diff options
| author | Florian Weimer <fweimer@redhat.com> | 2020-10-07 16:40:23 +0200 |
|---|---|---|
| committer | Florian Weimer <fweimer@redhat.com> | 2020-10-07 16:40:23 +0200 |
| commit | 56f8d442942ee51824b4683be83f776a811a3f2a (patch) | |
| tree | 20a815964f4d5d2b918fd08088e6332d3b5a4244 /elf/dl-load.c | |
| parent | 27fe5f2e67a0e4cc0526b1b32b55f8e519075edb (diff) | |
| download | glibc-56f8d442942ee51824b4683be83f776a811a3f2a.tar glibc-56f8d442942ee51824b4683be83f776a811a3f2a.tar.gz glibc-56f8d442942ee51824b4683be83f776a811a3f2a.tar.bz2 glibc-56f8d442942ee51824b4683be83f776a811a3f2a.zip | |
elf: Do not search HWCAP subdirectories in statically linked binaries
This functionality does not seem to be useful since static dlopen
is mostly used for iconv/character set conversion and NSS support.
gconv modules are loaded with full paths anyway, so that the
HWCAP subdirectory logic does not apply.
Reviewed-by: Adhemerval Zanella <adhemerval.zanella@linaro.org>
Diffstat (limited to 'elf/dl-load.c')
| -rw-r--r-- | elf/dl-load.c | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/elf/dl-load.c b/elf/dl-load.c index 646c5dca40..5ba117d597 100644 --- a/elf/dl-load.c +++ b/elf/dl-load.c @@ -101,9 +101,13 @@ int __stack_prot attribute_hidden attribute_relro static struct r_search_path_struct env_path_list attribute_relro; /* List of the hardware capabilities we might end up using. */ +#ifdef SHARED static const struct r_strlenpair *capstr attribute_relro; static size_t ncapstr attribute_relro; static size_t max_capstrlen attribute_relro; +#else +enum { ncapstr = 1, max_capstrlen = 0 }; +#endif /* Get the generated information about the trusted directories. Use @@ -691,9 +695,11 @@ _dl_init_paths (const char *llp) /* Fill in the information about the application's RPATH and the directories addressed by the LD_LIBRARY_PATH environment variable. */ +#ifdef SHARED /* Get the capabilities. */ capstr = _dl_important_hwcaps (GLRO(dl_platform), GLRO(dl_platformlen), &ncapstr, &max_capstrlen); +#endif /* First set up the rest of the default search directory entries. */ aelem = rtld_search_dirs.dirs = (struct r_search_path_elem **) @@ -1521,11 +1527,15 @@ print_search_path (struct r_search_path_elem **list, for (cnt = 0; cnt < ncapstr; ++cnt) if ((*list)->status[cnt] != nonexisting) { +#ifdef SHARED char *cp = __mempcpy (endp, capstr[cnt].str, capstr[cnt].len); if (cp == buf || (cp == buf + 1 && buf[0] == '/')) cp[0] = '\0'; else cp[-1] = '\0'; +#else + *endp = '\0'; +#endif _dl_debug_printf_c (first ? "%s" : ":%s", buf); first = 0; @@ -1886,11 +1896,15 @@ open_path (const char *name, size_t namelen, int mode, if (this_dir->status[cnt] == nonexisting) continue; +#ifdef SHARED buflen = ((char *) __mempcpy (__mempcpy (edp, capstr[cnt].str, capstr[cnt].len), name, namelen) - buf); +#else + buflen = (char *) __mempcpy (edp, name, namelen) - buf; +#endif /* Print name we try if this is wanted. */ if (__glibc_unlikely (GLRO(dl_debug_mask) & DL_DEBUG_LIBS)) |