Page MenuHomeFreeBSD
Files F105769223

D29633.diff
No OneTemporary
Actions

D29633.diff
View Options

diff --git a/libexec/rtld-elf/rtld.h b/libexec/rtld-elf/rtld.h
--- a/libexec/rtld-elf/rtld.h
+++ b/libexec/rtld-elf/rtld.h
@@ -389,6 +389,7 @@
Obj_Entry *globallist_next(const Obj_Entry *obj);
void obj_free(Obj_Entry *);
Obj_Entry *obj_new(void);
+Obj_Entry *obj_from_addr(const void *);
void _rtld_bind_start(void);
void *rtld_resolve_ifunc(const Obj_Entry *obj, const Elf_Sym *def);
void symlook_init(SymLook *, const char *);
diff --git a/libexec/rtld-elf/rtld.c b/libexec/rtld-elf/rtld.c
--- a/libexec/rtld-elf/rtld.c
+++ b/libexec/rtld-elf/rtld.c
@@ -124,7 +124,6 @@
static void map_stacks_exec(RtldLockState *);
static int obj_disable_relro(Obj_Entry *);
static int obj_enforce_relro(Obj_Entry *);
-static Obj_Entry *obj_from_addr(const void *);
static void objlist_call_fini(Objlist *, Obj_Entry *, RtldLockState *);
static void objlist_call_init(Objlist *, RtldLockState *);
static void objlist_clear(Objlist *);
@@ -2688,7 +2687,7 @@
return (NULL);
}
-static Obj_Entry *
+Obj_Entry *
obj_from_addr(const void *addr)
{
Obj_Entry *obj;
diff --git a/libexec/rtld-elf/rtld_lock.h b/libexec/rtld-elf/rtld_lock.h
--- a/libexec/rtld-elf/rtld_lock.h
+++ b/libexec/rtld-elf/rtld_lock.h
@@ -63,6 +63,8 @@
extern rtld_lock_t rtld_libc_lock;
extern rtld_lock_t rtld_phdr_lock;
+extern struct RtldLockInfo lockinfo;
+
#define RTLD_LOCK_UNLOCKED 0
#define RTLD_LOCK_RLOCKED 1
#define RTLD_LOCK_WLOCKED 2
diff --git a/libexec/rtld-elf/rtld_lock.c b/libexec/rtld-elf/rtld_lock.c
--- a/libexec/rtld-elf/rtld_lock.c
+++ b/libexec/rtld-elf/rtld_lock.c
@@ -192,7 +192,7 @@
/*
* Public interface exposed to the rest of the dynamic linker.
*/
-static struct RtldLockInfo lockinfo;
+struct RtldLockInfo lockinfo;
static struct RtldLockInfo deflockinfo;
static __inline int

File Metadata

Mime Type
text/plain
Expires
Sat, Dec 21, 10:46 AM (18 h, 32 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
15540525
Default Alt Text
D29633.diff (1 KB)

Event Timeline