diff options
| author | Konstantin Belousov <kib@FreeBSD.org> | 2020-06-16 21:23:39 +0000 |
|---|---|---|
| committer | Konstantin Belousov <kib@FreeBSD.org> | 2020-06-16 21:23:39 +0000 |
| commit | de34401534b2fb5288c761c59f724fc6df1fef72 (patch) | |
| tree | a3bd43068720aa6fdfb19615b41674fb1e439903 /libexec | |
| parent | 6f5b118fe160547f534f59705566fc02c126a2da (diff) | |
| download | src-de34401534b2fb5288c761c59f724fc6df1fef72.tar.gz src-de34401534b2fb5288c761c59f724fc6df1fef72.zip | |
Systematically pass RTLD_LO_TRACE to load_needed_objects().
Which makes all calls to load_object() to observe the flag, except the
calls for preloaded DSOs.
Sponsored by: The FreeBSD Foundation
MFC after: 1 week
Notes
Notes:
svn path=/head/; revision=362249
Diffstat (limited to 'libexec')
| -rw-r--r-- | libexec/rtld-elf/rtld.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/libexec/rtld-elf/rtld.c b/libexec/rtld-elf/rtld.c index 2e96e86ba690..c19568bd849a 100644 --- a/libexec/rtld-elf/rtld.c +++ b/libexec/rtld-elf/rtld.c @@ -721,7 +721,8 @@ _rtld(Elf_Addr *sp, func_ptr_type *exit_proc, Obj_Entry **objp) preload_tail = globallist_curr(TAILQ_LAST(&obj_list, obj_entry_q)); dbg("loading needed objects"); - if (load_needed_objects(obj_main, 0) == -1) + if (load_needed_objects(obj_main, ld_tracing != NULL ? RTLD_LO_TRACE : + 0) == -1) rtld_die(); /* Make a list of all objects loaded at startup. */ @@ -3472,7 +3473,7 @@ dlopen_object(const char *name, int fd, Obj_Entry *refobj, int lo_flags, } if (result != -1) result = load_needed_objects(obj, lo_flags & (RTLD_LO_DLOPEN | - RTLD_LO_EARLY | RTLD_LO_IGNSTLS)); + RTLD_LO_EARLY | RTLD_LO_IGNSTLS | RTLD_LO_TRACE)); init_dag(obj); ref_dag(obj); if (result != -1) |