diff options
| author | kib <kib@FreeBSD.org> | 2015-01-03 18:09:53 +0000 |
|---|---|---|
| committer | kib <kib@FreeBSD.org> | 2015-01-03 18:09:53 +0000 |
| commit | 7ac15f4b4cebad0f4e9d2094b6ea3fefa77ae568 (patch) | |
| tree | 77d9b8aa75c4eccb41859ec99d2118fc5e9d2c88 /libexec | |
| parent | dd66ca979aa54485500edfe6280e798099206ec9 (diff) | |
| download | FreeBSD-src-7ac15f4b4cebad0f4e9d2094b6ea3fefa77ae568.zip FreeBSD-src-7ac15f4b4cebad0f4e9d2094b6ea3fefa77ae568.tar.gz | |
Add rtld private interface for dso to detect dynamic loading
vs. static linking.
Tested by: pho, antoine (exp-run)
Sponsored by: The FreeBSD Foundation
MFC after: 1 week
Diffstat (limited to 'libexec')
| -rw-r--r-- | libexec/rtld-elf/Symbol.map | 1 | ||||
| -rw-r--r-- | libexec/rtld-elf/rtld.c | 22 | ||||
| -rw-r--r-- | libexec/rtld-elf/rtld.h | 1 |
3 files changed, 24 insertions, 0 deletions
diff --git a/libexec/rtld-elf/Symbol.map b/libexec/rtld-elf/Symbol.map index 5ea7d7e..4adc2ad 100644 --- a/libexec/rtld-elf/Symbol.map +++ b/libexec/rtld-elf/Symbol.map @@ -30,5 +30,6 @@ FBSDprivate_1.0 { _rtld_atfork_post; _rtld_addr_phdr; _rtld_get_stack_prot; + _rtld_is_dlopened; _r_debug_postinit; }; diff --git a/libexec/rtld-elf/rtld.c b/libexec/rtld-elf/rtld.c index 6bbb10c..1550da1 100644 --- a/libexec/rtld-elf/rtld.c +++ b/libexec/rtld-elf/rtld.c @@ -2222,6 +2222,7 @@ do_load_object(int fd, const char *name, char *path, struct stat *sbp, return (NULL); } + obj->dlopened = (flags & RTLD_LO_DLOPEN) != 0; *obj_tail = obj; obj_tail = &obj->next; obj_count++; @@ -4884,6 +4885,27 @@ _rtld_get_stack_prot(void) return (stack_prot); } +int +_rtld_is_dlopened(void *arg) +{ + Obj_Entry *obj; + RtldLockState lockstate; + int res; + + rlock_acquire(rtld_bind_lock, &lockstate); + obj = dlcheck(arg); + if (obj == NULL) + obj = obj_from_addr(arg); + if (obj == NULL) { + _rtld_error("No shared object contains address"); + lock_release(rtld_bind_lock, &lockstate); + return (-1); + } + res = obj->dlopened ? 1 : 0; + lock_release(rtld_bind_lock, &lockstate); + return (res); +} + static void map_stacks_exec(RtldLockState *lockstate) { diff --git a/libexec/rtld-elf/rtld.h b/libexec/rtld-elf/rtld.h index ace229f..e539117 100644 --- a/libexec/rtld-elf/rtld.h +++ b/libexec/rtld-elf/rtld.h @@ -275,6 +275,7 @@ typedef struct Struct_Obj_Entry { bool crt_no_init : 1; /* Object' crt does not call _init/_fini */ bool valid_hash_sysv : 1; /* A valid System V hash hash tag is available */ bool valid_hash_gnu : 1; /* A valid GNU hash tag is available */ + bool dlopened : 1; /* dlopen()-ed (vs. load statically) */ struct link_map linkmap; /* For GDB and dlinfo() */ Objlist dldags; /* Object belongs to these dlopened DAGs (%) */ |
