qiurui
/
glibc
mirror of git://sourceware.org/git/glibc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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.
This commit is contained in:
Dmitry V. Levin 2017-12-19 21:06:23 +00:00
parent 48a8f83281
commit 97f13188c9
2 changed files with 6 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -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> 2017-12-24 Zack Weinberg <zackw@panix.com>
* libio/libio.h, libio/_G_config.h: New stub headers which issue a * libio/libio.h, libio/_G_config.h: New stub headers which issue a

21
elf/dl-load.c
View File

@ -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 /* We cannot use this path element, the value of the
replacement is unknown. */ replacement is unknown. */
wp = last_elem; wp = last_elem;
name += len; break;
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;
} }
else else
/* No DST we recognize. */ /* No DST we recognize. */
@ -306,19 +300,6 @@ _dl_dst_substitute (struct link_map *l, const char *name, char *result,
else else
{ {
*wp++ = *name++; *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'); while (*name != '\0');