d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Introduce implementation-private rtld interface _rtld_addr_phdr, which

Browse Source 
fills struct dl_phdr_info for the shared object that contains the
specified address, if any.

Idea and reviewed by:	kan
MFC after:	3 weeks
This commit is contained in:
Konstantin Belousov 2010-08-23 15:27:03 +00:00
parent aeaffd647e
commit e048186a62
5 changed files with 48 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lib/libc/gen/Symbol.map
View File

@ -446,6 +446,7 @@ FBSDprivate_1.0 {
_spinlock;
_spinlock_debug;
_spinunlock;
_rtld_addr_phdr;
_rtld_atfork_pre;
_rtld_atfork_post;
_rtld_error; /* for private use */

8
lib/libc/gen/dlfcn.c
View File

@ -157,3 +157,11 @@ void
_rtld_atfork_post(int *locks)
{
}
#pragma weak _rtld_addr_phdr
int
_rtld_addr_phdr(const void *addr, struct dl_phdr_info *phdr_info)
{
return (0);
}

1
libexec/rtld-elf/Symbol.map
View File

@ -27,4 +27,5 @@ FBSDprivate_1.0 {
_rtld_free_tls;
_rtld_atfork_pre;
_rtld_atfork_post;
_rtld_addr_phdr;
};

47
libexec/rtld-elf/rtld.c
View File

@ -147,6 +147,8 @@ static int rtld_verify_object_versions(Obj_Entry *);
static void object_add_name(Obj_Entry *, const char *);
static int object_match_name(const Obj_Entry *, const char *);
static void ld_utrace_log(int, void *, void *, size_t, int, const char *);
static void rtld_fill_dl_phdr_info(const Obj_Entry *obj,
struct dl_phdr_info *phdr_info);
void r_debug_state(struct r_debug *, struct link_map *);
@ -220,6 +222,7 @@ static func_ptr_type exports[] = {
(func_ptr_type) &dl_iterate_phdr,
(func_ptr_type) &_rtld_atfork_pre,
(func_ptr_type) &_rtld_atfork_post,
(func_ptr_type) &_rtld_addr_phdr,
NULL
};
@ -2260,6 +2263,24 @@ dlvsym(void *handle, const char *name, const char *version)
SYMLOOK_DLSYM);
}
int
_rtld_addr_phdr(const void *addr, struct dl_phdr_info *phdr_info)
{
const Obj_Entry *obj;
int lockstate;
lockstate = rlock_acquire(rtld_bind_lock);
obj = obj_from_addr(addr);
if (obj == NULL) {
_rtld_error("No shared object contains address");
rlock_release(rtld_bind_lock, lockstate);
return (0);
}
rtld_fill_dl_phdr_info(obj, phdr_info);
rlock_release(rtld_bind_lock, lockstate);
return (1);
}
int
dladdr(const void *addr, Dl_info *info)
{
@ -2362,6 +2383,21 @@ dlinfo(void *handle, int request, void *p)
return (error);
}
static void
rtld_fill_dl_phdr_info(const Obj_Entry *obj, struct dl_phdr_info *phdr_info)
{
phdr_info->dlpi_addr = (Elf_Addr)obj->relocbase;
phdr_info->dlpi_name = STAILQ_FIRST(&obj->names) ?
STAILQ_FIRST(&obj->names)->name : obj->path;
phdr_info->dlpi_phdr = obj->phdr;
phdr_info->dlpi_phnum = obj->phsize / sizeof(obj->phdr[0]);
phdr_info->dlpi_tls_modid = obj->tlsindex;
phdr_info->dlpi_tls_data = obj->tlsinit;
phdr_info->dlpi_adds = obj_loads;
phdr_info->dlpi_subs = obj_loads - obj_count;
}
int
dl_iterate_phdr(__dl_iterate_hdr_callback callback, void *param)
{
@ -2375,16 +2411,7 @@ dl_iterate_phdr(__dl_iterate_hdr_callback callback, void *param)
error = 0;
for (obj = obj_list; obj != NULL; obj = obj->next) {
phdr_info.dlpi_addr = (Elf_Addr)obj->relocbase;
phdr_info.dlpi_name = STAILQ_FIRST(&obj->names) ?
STAILQ_FIRST(&obj->names)->name : obj->path;
phdr_info.dlpi_phdr = obj->phdr;
phdr_info.dlpi_phnum = obj->phsize / sizeof(obj->phdr[0]);
phdr_info.dlpi_tls_modid = obj->tlsindex;
phdr_info.dlpi_tls_data = obj->tlsinit;
phdr_info.dlpi_adds = obj_loads;
phdr_info.dlpi_subs = obj_loads - obj_count;
rtld_fill_dl_phdr_info(obj, &phdr_info);
if ((error = callback(&phdr_info, sizeof phdr_info, param)) != 0)
break;

1
sys/sys/link_elf.h
View File

@ -92,6 +92,7 @@ __BEGIN_DECLS
typedef int (*__dl_iterate_hdr_callback)(struct dl_phdr_info *, size_t, void *);
extern int dl_iterate_phdr(__dl_iterate_hdr_callback, void *);
int _rtld_addr_phdr(const void *, struct dl_phdr_info *);
__END_DECLS