aboutsummaryrefslogtreecommitdiff
path: root/elf
diff options
context:
space:
mode:
authorDmitry V. Levin <ldv@altlinux.org>2017-12-17 23:49:46 +0000
committerDmitry V. Levin <ldv@altlinux.org>2017-12-18 12:24:48 +0000
commitbb195224acc14724e9fc2dbaa8d0b20b72ace79b (patch)
tree0458120ff6924bac8e38e32b437aeed19167316c /elf
parent14d886edbd3d80b771e1c42fbd9217f9074de9c6 (diff)
downloadglibc-bb195224acc14724e9fc2dbaa8d0b20b72ace79b.zip
glibc-bb195224acc14724e9fc2dbaa8d0b20b72ace79b.tar.gz
glibc-bb195224acc14724e9fc2dbaa8d0b20b72ace79b.tar.bz2
elf: do not substitute dst in $LD_LIBRARY_PATH twice [BZ #22627]
Starting with commit glibc-2.18.90-470-g2a939a7e6d81f109d49306bc2e10b4ac9ceed8f9 that introduced substitution of dynamic string tokens in fillin_rpath, _dl_init_paths invokes _dl_dst_substitute for $LD_LIBRARY_PATH twice: the first time it's called directly, the second time the result is passed on to fillin_rpath which calls expand_dynamic_string_token which in turn calls _dl_dst_substitute, leading to the following behaviour: $ mkdir -p /tmp/'$ORIGIN' && cd /tmp/'$ORIGIN' && echo 'int main(){}' |gcc -xc - && strace -qq -E LD_LIBRARY_PATH='$ORIGIN' -e /open ./a.out open("/tmp//tmp/$ORIGIN/tls/x86_64/libc.so.6", O_RDONLY|O_CLOEXEC) = -1 ENOENT (No such file or directory) open("/tmp//tmp/$ORIGIN/tls/libc.so.6", O_RDONLY|O_CLOEXEC) = -1 ENOENT (No such file or directory) open("/tmp//tmp/$ORIGIN/x86_64/libc.so.6", O_RDONLY|O_CLOEXEC) = -1 ENOENT (No such file or directory) open("/tmp//tmp/$ORIGIN/libc.so.6", O_RDONLY|O_CLOEXEC) = -1 ENOENT (No such file or directory) open("/etc/ld.so.cache", O_RDONLY|O_CLOEXEC) = 3 open("/lib64/libc.so.6", O_RDONLY|O_CLOEXEC) = 3 Fix this by removing the direct _dl_dst_substitute invocation. * elf/dl-load.c (_dl_init_paths): Remove _dl_dst_substitute preparatory code and invocation.
Diffstat (limited to 'elf')
-rw-r--r--elf/dl-load.c20
1 files changed, 1 insertions, 19 deletions
diff --git a/elf/dl-load.c b/elf/dl-load.c
index bbd3be9e..e7d97dc 100644
--- a/elf/dl-load.c
+++ b/elf/dl-load.c
@@ -773,25 +773,7 @@ _dl_init_paths (const char *llp)
if (llp != NULL && *llp != '\0')
{
- char *llp_tmp;
-
-#ifdef SHARED
- /* Expand DSTs. */
- size_t cnt = DL_DST_COUNT (llp, 1);
- if (__glibc_likely (cnt == 0))
- llp_tmp = strdupa (llp);
- else
- {
- /* Determine the length of the substituted string. */
- size_t total = DL_DST_REQUIRED (l, llp, strlen (llp), cnt);
-
- /* Allocate the necessary memory. */
- llp_tmp = (char *) alloca (total + 1);
- llp_tmp = _dl_dst_substitute (l, llp, llp_tmp, 1);
- }
-#else
- llp_tmp = strdupa (llp);
-#endif
+ char *llp_tmp = strdupa (llp);
/* Decompose the LD_LIBRARY_PATH contents. First determine how many
elements it has. */