diff options
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | elf/dl-deps.c | 4 | ||||
| -rw-r--r-- | elf/dl-dst.h | 4 | ||||
| -rw-r--r-- | elf/dl-load.c | 32 | ||||
| -rw-r--r-- | sysdeps/generic/ldsodefs.h | 4 |
5 files changed, 27 insertions, 24 deletions
diff --git a/ChangeLog b/ChangeLog index 97aeed5db5..a1e065e62c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,12 @@ 2017-12-27 Dmitry V. Levin <ldv@altlinux.org> + * elf/dl-dst.h (DL_DST_COUNT): Remove is_path argument, all callers + updated. + * elf/dl-load.c (is_dst, _dl_dst_count, _dl_dst_substitute, + expand_dynamic_string_token): Likewise. + * sysdeps/generic/ldsodefs.h (_dl_dst_count, _dl_dst_substitute): Remove + is_path argument. + * elf/dl-load.c (is_dst): Remove checks that is_path is set and name contains ':'. diff --git a/elf/dl-deps.c b/elf/dl-deps.c index 622331e6e2..46ceb4adfe 100644 --- a/elf/dl-deps.c +++ b/elf/dl-deps.c @@ -100,7 +100,7 @@ struct list ({ \ const char *__str = (str); \ const char *__result = __str; \ - size_t __dst_cnt = DL_DST_COUNT (__str, 0); \ + size_t __dst_cnt = DL_DST_COUNT (__str); \ \ if (__dst_cnt != 0) \ { \ @@ -114,7 +114,7 @@ DST not allowed in SUID/SGID programs")); \ __newp = (char *) alloca (DL_DST_REQUIRED (l, __str, strlen (__str), \ __dst_cnt)); \ \ - __result = _dl_dst_substitute (l, __str, __newp, 0); \ + __result = _dl_dst_substitute (l, __str, __newp); \ \ if (*__result == '\0') \ { \ diff --git a/elf/dl-dst.h b/elf/dl-dst.h index a96513d4dc..3d2c667913 100644 --- a/elf/dl-dst.h +++ b/elf/dl-dst.h @@ -20,13 +20,13 @@ /* Determine the number of DST elements in the name. Only if IS_PATH is nonzero paths are recognized (i.e., multiple, ':' separated filenames). */ -#define DL_DST_COUNT(name, is_path) \ +#define DL_DST_COUNT(name) \ ({ \ size_t __cnt = 0; \ const char *__sf = strchr (name, '$'); \ \ if (__glibc_unlikely (__sf != NULL)) \ - __cnt = _dl_dst_count (__sf, is_path); \ + __cnt = _dl_dst_count (__sf); \ \ __cnt; }) diff --git a/elf/dl-load.c b/elf/dl-load.c index 87dfdf8a15..ae86f0b85e 100644 --- a/elf/dl-load.c +++ b/elf/dl-load.c @@ -180,8 +180,7 @@ is_trusted_path_normalize (const char *path, size_t len) static size_t -is_dst (const char *start, const char *name, const char *str, - int is_path, int secure) +is_dst (const char *start, const char *name, const char *str, int secure) { size_t len; bool is_curly = false; @@ -219,7 +218,7 @@ is_dst (const char *start, const char *name, const char *str, size_t -_dl_dst_count (const char *name, int is_path) +_dl_dst_count (const char *name) { const char *const start = name; size_t cnt = 0; @@ -231,10 +230,9 @@ _dl_dst_count (const char *name, int is_path) /* $ORIGIN is not expanded for SUID/GUID programs (except if it is $ORIGIN alone) and it must always appear first in path. */ ++name; - if ((len = is_dst (start, name, "ORIGIN", is_path, - __libc_enable_secure)) != 0 - || (len = is_dst (start, name, "PLATFORM", is_path, 0)) != 0 - || (len = is_dst (start, name, "LIB", is_path, 0)) != 0) + if ((len = is_dst (start, name, "ORIGIN", __libc_enable_secure)) != 0 + || (len = is_dst (start, name, "PLATFORM", 0)) != 0 + || (len = is_dst (start, name, "LIB", 0)) != 0) ++cnt; name = strchr (name + len, '$'); @@ -246,8 +244,7 @@ _dl_dst_count (const char *name, int is_path) char * -_dl_dst_substitute (struct link_map *l, const char *name, char *result, - int is_path) +_dl_dst_substitute (struct link_map *l, const char *name, char *result) { const char *const start = name; @@ -267,16 +264,15 @@ _dl_dst_substitute (struct link_map *l, const char *name, char *result, size_t len; ++name; - if ((len = is_dst (start, name, "ORIGIN", is_path, - __libc_enable_secure)) != 0) + if ((len = is_dst (start, name, "ORIGIN", __libc_enable_secure)) != 0) { repl = l->l_origin; check_for_trusted = (__libc_enable_secure && l->l_type == lt_executable); } - else if ((len = is_dst (start, name, "PLATFORM", is_path, 0)) != 0) + else if ((len = is_dst (start, name, "PLATFORM", 0)) != 0) repl = GLRO(dl_platform); - else if ((len = is_dst (start, name, "LIB", is_path, 0)) != 0) + else if ((len = is_dst (start, name, "LIB", 0)) != 0) repl = DL_DST_LIB; if (repl != NULL && repl != (const char *) -1) @@ -320,7 +316,7 @@ _dl_dst_substitute (struct link_map *l, const char *name, char *result, belonging to the map is loaded. In this case the path element containing $ORIGIN is left out. */ static char * -expand_dynamic_string_token (struct link_map *l, const char *s, int is_path) +expand_dynamic_string_token (struct link_map *l, const char *s) { /* We make two runs over the string. First we determine how large the resulting string is and then we copy it over. Since this is no @@ -331,7 +327,7 @@ expand_dynamic_string_token (struct link_map *l, const char *s, int is_path) char *result; /* Determine the number of DST elements. */ - cnt = DL_DST_COUNT (s, is_path); + cnt = DL_DST_COUNT (s); /* If we do not have to replace anything simply copy the string. */ if (__glibc_likely (cnt == 0)) @@ -345,7 +341,7 @@ expand_dynamic_string_token (struct link_map *l, const char *s, int is_path) if (result == NULL) return NULL; - return _dl_dst_substitute (l, s, result, is_path); + return _dl_dst_substitute (l, s, result); } @@ -399,7 +395,7 @@ fillin_rpath (char *rpath, struct r_search_path_elem **result, const char *sep, { struct r_search_path_elem *dirp; - to_free = cp = expand_dynamic_string_token (l, cp, 1); + to_free = cp = expand_dynamic_string_token (l, cp); size_t len = strlen (cp); @@ -2070,7 +2066,7 @@ _dl_map_object (struct link_map *loader, const char *name, { /* The path may contain dynamic string tokens. */ realname = (loader - ? expand_dynamic_string_token (loader, name, 0) + ? expand_dynamic_string_token (loader, name) : __strdup (name)); if (realname == NULL) fd = -1; diff --git a/sysdeps/generic/ldsodefs.h b/sysdeps/generic/ldsodefs.h index 658a4f20b4..c533b3be43 100644 --- a/sysdeps/generic/ldsodefs.h +++ b/sysdeps/generic/ldsodefs.h @@ -1096,11 +1096,11 @@ extern void _dl_nothread_init_static_tls (struct link_map *) attribute_hidden; extern const char *_dl_get_origin (void) attribute_hidden; /* Count DSTs. */ -extern size_t _dl_dst_count (const char *name, int is_path) attribute_hidden; +extern size_t _dl_dst_count (const char *name) attribute_hidden; /* Substitute DST values. */ extern char *_dl_dst_substitute (struct link_map *l, const char *name, - char *result, int is_path) attribute_hidden; + char *result) attribute_hidden; /* Check validity of the caller. */ extern int _dl_check_caller (const void *caller, enum allowmask mask) |