generic-library/bionic
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

am ca7bc509: Merge "make vdso function pointers read-only at runtime"

Browse Source 
* commit 'ca7bc509cf3b321b4721137df1e5407415fc7dd7':
  make vdso function pointers read-only at runtime
This commit is contained in:
Elliott Hughes 2015-07-17 18:39:31 +00:00 committed by Android Git Automerger
commit 87b64fb447
1 changed files with 35 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
libc/bionic/vdso.cpp
View File

@ -30,8 +30,14 @@
#define VDSO_GETTIMEOFDAY_SYMBOL "__vdso_gettimeofday" #define VDSO_GETTIMEOFDAY_SYMBOL "__vdso_gettimeofday"
#endif #endif
#include <errno.h>
#include <limits.h>
#include <sys/mman.h>
#include <time.h> #include <time.h>
#include "private/bionic_prctl.h"
#include "private/libc_logging.h"
extern "C" int __clock_gettime(int, timespec*); extern "C" int __clock_gettime(int, timespec*);
extern "C" int __gettimeofday(timeval*, struct timezone*); extern "C" int __gettimeofday(timeval*, struct timezone*);
@ -46,28 +52,33 @@ enum {
VDSO_END VDSO_END
}; };
static vdso_entry vdso_entries[] = { static const vdso_entry vdso_entries_template[] = {
[VDSO_CLOCK_GETTIME] = { VDSO_CLOCK_GETTIME_SYMBOL, reinterpret_cast<void*>(__clock_gettime) }, [VDSO_CLOCK_GETTIME] = { VDSO_CLOCK_GETTIME_SYMBOL, reinterpret_cast<void*>(__clock_gettime) },
[VDSO_GETTIMEOFDAY] = { VDSO_GETTIMEOFDAY_SYMBOL, reinterpret_cast<void*>(__gettimeofday) }, [VDSO_GETTIMEOFDAY] = { VDSO_GETTIMEOFDAY_SYMBOL, reinterpret_cast<void*>(__gettimeofday) },
}; };
static vdso_entry* vdso_entries;
int clock_gettime(int clock_id, timespec* tp) { int clock_gettime(int clock_id, timespec* tp) {
static int (*vdso_clock_gettime)(int, timespec*) = int (*vdso_clock_gettime)(int, timespec*) =
reinterpret_cast<int (*)(int, timespec*)>(vdso_entries[VDSO_CLOCK_GETTIME].fn); reinterpret_cast<int (*)(int, timespec*)>(vdso_entries[VDSO_CLOCK_GETTIME].fn);
return vdso_clock_gettime(clock_id, tp); return vdso_clock_gettime(clock_id, tp);
} }
int gettimeofday(timeval* tv, struct timezone* tz) { int gettimeofday(timeval* tv, struct timezone* tz) {
static int (*vdso_gettimeofday)(timeval*, struct timezone*) = int (*vdso_gettimeofday)(timeval*, struct timezone*) =
reinterpret_cast<int (*)(timeval*, struct timezone*)>(vdso_entries[VDSO_GETTIMEOFDAY].fn); reinterpret_cast<int (*)(timeval*, struct timezone*)>(vdso_entries[VDSO_GETTIMEOFDAY].fn);
return vdso_gettimeofday(tv, tz); return vdso_gettimeofday(tv, tz);
} }
void __libc_init_vdso() { static void __libc_init_vdso_entries() {
// Set up the defaults in case we don't have a vdso or can't find everything we're looking for.
memcpy(vdso_entries, vdso_entries_template, sizeof(vdso_entries_template));
// Do we have a vdso? // Do we have a vdso?
uintptr_t vdso_ehdr_addr = getauxval(AT_SYSINFO_EHDR); uintptr_t vdso_ehdr_addr = getauxval(AT_SYSINFO_EHDR);
ElfW(Ehdr)* vdso_ehdr = reinterpret_cast<ElfW(Ehdr)*>(vdso_ehdr_addr); ElfW(Ehdr)* vdso_ehdr = reinterpret_cast<ElfW(Ehdr)*>(vdso_ehdr_addr);
if (vdso_ehdr == NULL) { if (vdso_ehdr == nullptr) {
return; return;
} }
@ -85,7 +96,7 @@ void __libc_init_vdso() {
// Where's the dynamic table? // Where's the dynamic table?
ElfW(Addr) vdso_addr = 0; ElfW(Addr) vdso_addr = 0;
ElfW(Dyn)* vdso_dyn = NULL; ElfW(Dyn)* vdso_dyn = nullptr;
ElfW(Phdr)* vdso_phdr = reinterpret_cast<ElfW(Phdr)*>(vdso_ehdr_addr + vdso_ehdr->e_phoff); ElfW(Phdr)* vdso_phdr = reinterpret_cast<ElfW(Phdr)*>(vdso_ehdr_addr + vdso_ehdr->e_phoff);
for (size_t i = 0; i < vdso_ehdr->e_phnum; ++i) { for (size_t i = 0; i < vdso_ehdr->e_phnum; ++i) {
if (vdso_phdr[i].p_type == PT_DYNAMIC) { if (vdso_phdr[i].p_type == PT_DYNAMIC) {
@ -94,13 +105,13 @@ void __libc_init_vdso() {
vdso_addr = vdso_ehdr_addr + vdso_phdr[i].p_offset - vdso_phdr[i].p_vaddr; vdso_addr = vdso_ehdr_addr + vdso_phdr[i].p_offset - vdso_phdr[i].p_vaddr;
} }
} }
if (vdso_addr == 0 || vdso_dyn == NULL) { if (vdso_addr == 0 || vdso_dyn == nullptr) {
return; return;
} }
// Where are the string and symbol tables? // Where are the string and symbol tables?
const char* strtab = NULL; const char* strtab = nullptr;
ElfW(Sym)* symtab = NULL; ElfW(Sym)* symtab = nullptr;
for (ElfW(Dyn)* d = vdso_dyn; d->d_tag != DT_NULL; ++d) { for (ElfW(Dyn)* d = vdso_dyn; d->d_tag != DT_NULL; ++d) {
if (d->d_tag == DT_STRTAB) { if (d->d_tag == DT_STRTAB) {
strtab = reinterpret_cast<const char*>(vdso_addr + d->d_un.d_ptr); strtab = reinterpret_cast<const char*>(vdso_addr + d->d_un.d_ptr);
@ -108,7 +119,7 @@ void __libc_init_vdso() {
symtab = reinterpret_cast<ElfW(Sym)*>(vdso_addr + d->d_un.d_ptr); symtab = reinterpret_cast<ElfW(Sym)*>(vdso_addr + d->d_un.d_ptr);
} }
} }
if (strtab == NULL || symtab == NULL) { if (strtab == nullptr || symtab == nullptr) {
return; return;
} }
@ -122,6 +133,20 @@ void __libc_init_vdso() {
} }
} }
void __libc_init_vdso() {
static_assert(PAGE_SIZE >= sizeof(vdso_entries_template), "vdso_entries_template too large");
vdso_entries = reinterpret_cast<vdso_entry*>(mmap(nullptr, sizeof(vdso_entries_template), PROT_READ|PROT_WRITE,
MAP_ANONYMOUS|MAP_PRIVATE, -1, 0));
if (vdso_entries == MAP_FAILED) {
__libc_fatal("failed to allocate vdso function pointer table: %s", strerror(errno));
}
__libc_init_vdso_entries();
if (mprotect(vdso_entries, sizeof(vdso_entries_template), PROT_READ) == -1) {
__libc_fatal("failed to mprotect PROT_READ vdso function pointer table: %s", strerror(errno));
}
prctl(PR_SET_VMA, PR_SET_VMA_ANON_NAME, vdso_entries, sizeof(vdso_entries_template), "vdso function pointer table");
}
#else #else
void __libc_init_vdso() { void __libc_init_vdso() {