98 lines
3.6 KiB
Diff
98 lines
3.6 KiB
Diff
|
commit 56f8d442942ee51824b4683be83f776a811a3f2a
|
||
|
|
Author: Florian Weimer <fweimer@redhat.com>
|
||
|
|
Date: Wed Oct 7 16:40:23 2020 +0200
|
||
|
|
|
||
|
|
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>
|
||
|
|
|
||
|
|
diff --git a/elf/Makefile b/elf/Makefile
|
||
|
|
index 837a070c267527e1..ef655630d50b07aa 100644
|
||
|
|
--- a/elf/Makefile
|
||
|
|
+++ b/elf/Makefile
|
||
|
|
@@ -29,7 +29,7 @@ routines = $(all-dl-routines) dl-support dl-iteratephdr \
|
||
|
|
|
||
|
|
# The core dynamic linking functions are in libc for the static and
|
||
|
|
# profiled libraries.
|
||
|
|
-dl-routines = $(addprefix dl-,load lookup object reloc deps hwcaps \
|
||
|
|
+dl-routines = $(addprefix dl-,load lookup object reloc deps \
|
||
|
|
runtime init fini debug misc \
|
||
|
|
version profile tls origin scope \
|
||
|
|
execstack open close trampoline \
|
||
|
|
@@ -59,7 +59,7 @@ elide-routines.os = $(all-dl-routines) dl-support enbl-secure dl-origin \
|
||
|
|
# ld.so uses those routines, plus some special stuff for being the program
|
||
|
|
# interpreter and operating independent of libc.
|
||
|
|
rtld-routines = rtld $(all-dl-routines) dl-sysdep dl-environ dl-minimal \
|
||
|
|
- dl-error-minimal dl-conflict
|
||
|
|
+ dl-error-minimal dl-conflict dl-hwcaps
|
||
|
|
all-rtld-routines = $(rtld-routines) $(sysdep-rtld-routines)
|
||
|
|
|
||
|
|
CFLAGS-dl-runtime.c += -fexceptions -fasynchronous-unwind-tables
|
||
|
|
diff --git a/elf/dl-load.c b/elf/dl-load.c
|
||
|
|
index 64da5323d0e368c1..2b4dd9a0f3e27b70 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 **)
|
||
|
|
@@ -1459,11 +1465,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;
|
||
|
|
@@ -1836,11 +1846,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))
|