summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitry V. Levin <ldv@altlinux.org>2017-12-19 21:06:23 +0000
committerDmitry V. Levin <ldv@altlinux.org>2017-12-27 22:12:51 +0000
commit97f13188c9fbafeaab89146996b3cce1f4952b5e (patch)
tree517d63c21e7afc0be357bf610d2e76f6eef7840a
parent48a8f8328122ab8d06b7333cb87be46feeaf7cca (diff)
elf: remove redundant code from _dl_dst_substitute
There are just two users of _dl_dst_substitute: one is expand_dst that sets is_path argument to 0, another one is expand_dynamic_string_token. The latter function also has just two users: one is _dl_map_object that sets is_path argument to 0, another one is fillin_rpath that sets is_path argument to 1 and name argument contains no ':'. In any case (is_path && name[i] == ':') is always false and all code depending on it can be safely removed. * elf/dl-load.c (_dl_dst_substitute): Remove checks that is_path is set and name contains ':', and all code depending on these checks.
-rw-r--r--ChangeLog5
-rw-r--r--elf/dl-load.c21
2 files changed, 6 insertions, 20 deletions
diff --git a/ChangeLog b/ChangeLog
index 086bb81956..297dd703c5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2017-12-27 Dmitry V. Levin <ldv@altlinux.org>
+
+ * elf/dl-load.c (_dl_dst_substitute): Remove checks that is_path
+ is set and name contains ':', and all code depending on these checks.
+
2017-12-24 Zack Weinberg <zackw@panix.com>
* libio/libio.h, libio/_G_config.h: New stub headers which issue a
diff --git a/elf/dl-load.c b/elf/dl-load.c
index 2964464158..a60277d311 100644
--- a/elf/dl-load.c
+++ b/elf/dl-load.c
@@ -291,13 +291,7 @@ _dl_dst_substitute (struct link_map *l, const char *name, char *result,
/* We cannot use this path element, the value of the
replacement is unknown. */
wp = last_elem;
- name += len;
- while (*name != '\0' && (!is_path || *name != ':'))
- ++name;
- /* Also skip following colon if this is the first rpath
- element, but keep an empty element at the end. */
- if (wp == result && is_path && *name == ':' && name[1] != '\0')
- ++name;
+ break;
}
else
/* No DST we recognize. */
@@ -306,19 +300,6 @@ _dl_dst_substitute (struct link_map *l, const char *name, char *result,
else
{
*wp++ = *name++;
- if (is_path && *name == ':')
- {
- /* In SUID/SGID programs, after $ORIGIN expansion the
- normalized path must be rooted in one of the trusted
- directories. */
- if (__glibc_unlikely (check_for_trusted)
- && !is_trusted_path_normalize (last_elem, wp - last_elem))
- wp = last_elem;
- else
- last_elem = wp;
-
- check_for_trusted = false;
- }
}
}
while (*name != '\0');