mirror of
https://github.com/RGBCube/serenity
synced 2025-05-14 09:04:59 +00:00
LibC+DynamicLoader: Store the auxiliary vector address at startup
Previously, getauxval() got the address of the auxiliary vector by traversing to the end of the `environ` pointer. The assumption that the auxiliary vector comes after the environment array is true at program startup, however the environment array may be re-allocated and change its address during runtime which would cause getauxval() to work with an incorrect auxiliary vector address. To fix this, we now get the address of the auxiliary vector once in __libc_init and store it in a libc-internal pointer which is then used by getauxval(). Fixes #10087.
This commit is contained in:
parent
01900801e3
commit
a3360bcee8
3 changed files with 15 additions and 4 deletions
|
@ -19,10 +19,23 @@ __thread int errno;
|
|||
char** environ;
|
||||
bool __environ_is_malloced;
|
||||
bool __stdio_is_initialized;
|
||||
void* __auxiliary_vector;
|
||||
|
||||
static void __auxiliary_vector_init();
|
||||
|
||||
void __libc_init()
|
||||
{
|
||||
__auxiliary_vector_init();
|
||||
__malloc_init();
|
||||
__stdio_init();
|
||||
}
|
||||
|
||||
static void __auxiliary_vector_init()
|
||||
{
|
||||
char** env;
|
||||
for (env = environ; *env; ++env) {
|
||||
}
|
||||
|
||||
__auxiliary_vector = (void*)++env;
|
||||
}
|
||||
}
|
||||
|
|
|
@ -182,11 +182,8 @@ extern "C" {
|
|||
long getauxval(long type)
|
||||
{
|
||||
errno = 0;
|
||||
char** env;
|
||||
for (env = environ; *env; ++env) {
|
||||
}
|
||||
|
||||
auxv_t* auxvp = (auxv_t*)++env;
|
||||
auxv_t* auxvp = (auxv_t*)__auxiliary_vector;
|
||||
for (; auxvp->a_type != AT_NULL; ++auxvp) {
|
||||
if (auxvp->a_type == type)
|
||||
return auxvp->a_un.a_val;
|
||||
|
|
|
@ -19,6 +19,7 @@ extern void _init();
|
|||
extern bool __environ_is_malloced;
|
||||
extern bool __stdio_is_initialized;
|
||||
extern bool __heap_is_stable;
|
||||
extern void* __auxiliary_vector;
|
||||
|
||||
int __cxa_atexit(AtExitFunction exit_function, void* parameter, void* dso_handle);
|
||||
void __cxa_finalize(void* dso_handle);
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue