diff options
| author | Filippo Arcidiacono <filippo.arcidiacono@st.com> | 2012-05-30 17:11:12 +0200 |
|---|---|---|
| committer | Bernhard Reutner-Fischer <rep.dot.nop@gmail.com> | 2012-06-06 09:31:36 +0200 |
| commit | da117419bdb39a4cb5035ebba46379f7c48738b3 (patch) | |
| tree | 99c94543830bef45bf8ee047950b25001b0495b2 /ldso/ldso/ldso.c | |
| parent | 8554fb21bb34329201b38c2ae4387fb6f00645cc (diff) | |
ldso: preload standard path library with setuid bit set
For set-user-ID/set-group-ID ELF binaries, only libraries in the standard
search directories that are also set-user-ID must be loaded.
This patch fixes existing logic according to the above statement.
Furthermore if either library setuid bit isn't set or it cannot be found in
the standard search path, the library won't be preloaded but execution go
ahead with default one.
Signed-off-by: Filippo Arcidiacono <filippo.arcidiacono@st.com>
Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
Diffstat (limited to 'ldso/ldso/ldso.c')
| -rw-r--r-- | ldso/ldso/ldso.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/ldso/ldso/ldso.c b/ldso/ldso/ldso.c index f2ba628b3..d3891e269 100644 --- a/ldso/ldso/ldso.c +++ b/ldso/ldso/ldso.c @@ -503,15 +503,15 @@ void *_dl_get_ready_to_run(struct elf_resolve *tpnt, DL_LOADADDR_TYPE load_addr, const char *nextp; _dl_secure = 1; +#ifdef __LDSO_PRELOAD_ENV_SUPPORT__ + _dl_preload = _dl_getenv("LD_PRELOAD", envp); +#endif nextp = unsecure_envvars; do { _dl_unsetenv (nextp, envp); /* We could use rawmemchr but this need not be fast. */ nextp = _dl_strchr(nextp, '\0') + 1; } while (*nextp != '\0'); -#ifdef __LDSO_PRELOAD_ENV_SUPPORT__ - _dl_preload = NULL; -#endif #ifdef __LDSO_LD_LIBRARY_PATH__ _dl_library_path = NULL; #endif @@ -883,8 +883,9 @@ of this helper program; chances are you did not intend to run this program.\n\ else #endif { - _dl_dprintf(_dl_debug_file, "%s: can't load " "library '%s'\n", _dl_progname, str); - _dl_exit(15); + _dl_dprintf(_dl_debug_file, "%s: library '%s' " + "from LD_PRELOAD can't be preloaded: ignored.\n", + _dl_progname, str); } } else { tpnt1->rtld_flags = unlazy | RTLD_GLOBAL; |