diff options
| author | gjb <gjb@FreeBSD.org> | 2016-01-05 21:12:49 +0000 |
|---|---|---|
| committer | gjb <gjb@FreeBSD.org> | 2016-01-05 21:12:49 +0000 |
| commit | d198514d72a703ae0dda7f0ae171e86166b109d3 (patch) | |
| tree | ce68d7f81dded2be8cf4c6bd9181a9481a174936 /libexec | |
| parent | b7841d7cf87faf2d225f63defeb3419169db6819 (diff) | |
| download | FreeBSD-src-d198514d72a703ae0dda7f0ae171e86166b109d3.zip FreeBSD-src-d198514d72a703ae0dda7f0ae171e86166b109d3.tar.gz | |
MFH
Sponsored by: The FreeBSD Foundation
Diffstat (limited to 'libexec')
| -rw-r--r-- | libexec/rtld-elf/rtld.c | 6 | ||||
| -rw-r--r-- | libexec/rtld-elf/rtld.h | 1 |
2 files changed, 5 insertions, 2 deletions
diff --git a/libexec/rtld-elf/rtld.c b/libexec/rtld-elf/rtld.c index 66edc15..6daef2d 100644 --- a/libexec/rtld-elf/rtld.c +++ b/libexec/rtld-elf/rtld.c @@ -1144,13 +1144,13 @@ digest_dynamic1(Obj_Entry *obj, int early, const Elf_Dyn **dyn_rpath, * is mapped read-only. DT_MIPS_RLD_MAP is used instead. */ -#ifndef __mips__ case DT_DEBUG: + if (!obj->writable_dynamic) + break; if (!early) dbg("Filling in DT_DEBUG entry"); ((Elf_Dyn*)dynp)->d_un.d_ptr = (Elf_Addr) &r_debug; break; -#endif case DT_FLAGS: if (dynp->d_un.d_val & DF_ORIGIN) @@ -1331,6 +1331,8 @@ digest_phdr(const Elf_Phdr *phdr, int phnum, caddr_t entry, const char *path) break; case PT_DYNAMIC: + if (ph->p_flags & PROT_WRITE) + obj->writable_dynamic = true; obj->dynamic = (const Elf_Dyn *)(ph->p_vaddr + obj->relocbase); break; diff --git a/libexec/rtld-elf/rtld.h b/libexec/rtld-elf/rtld.h index 72a632e..f151db0 100644 --- a/libexec/rtld-elf/rtld.h +++ b/libexec/rtld-elf/rtld.h @@ -264,6 +264,7 @@ typedef struct Struct_Obj_Entry { 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) */ + bool writable_dynamic : 1; /* PT_DYNAMIC is writable */ struct link_map linkmap; /* For GDB and dlinfo() */ Objlist dldags; /* Object belongs to these dlopened DAGs (%) */ |
