mirror of
https://sourceware.org/git/glibc.git
synced 2025-07-30 22:43:12 +03:00
elf: Move vDSO setup to rtld (BZ#24967)
This patch moves the vDSO setup from libc to loader code, just after the vDSO link_map setup. For static case the initialization is moved to _dl_non_dynamic_init instead. Instead of using the mangled pointer, the vDSO data is set as attribute_relro (on _rtld_global_ro for shared or _dl_vdso_* for static). It is read-only even with partial relro. It fixes BZ#24967 now that the vDSO pointer is setup earlier than malloc interposition is called. Also, vDSO calls should not be a problem for static dlopen as indicated by BZ#20802. The vDSO pointer would be zero-initialized and the syscall will be issued instead. Checked on x86_64-linux-gnu, i686-linux-gnu, aarch64-linux-gnu, arm-linux-gnueabihf, powerpc64le-linux-gnu, powerpc64-linux-gnu, powerpc-linux-gnu, s390x-linux-gnu, sparc64-linux-gnu, and sparcv9-linux-gnu. I also run some tests on mips. Reviewed-by: Siddhesh Poyarekar <siddhesh@sourceware.org>
This commit is contained in:
@ -39,6 +39,8 @@
|
||||
#include <dl-osinfo.h>
|
||||
#include <dl-procinfo.h>
|
||||
#include <dl-prop.h>
|
||||
#include <dl-vdso.h>
|
||||
#include <dl-vdso-setup.h>
|
||||
#include <tls.h>
|
||||
#include <stap-probe.h>
|
||||
#include <stackinfo.h>
|
||||
@ -833,7 +835,7 @@ security_init (void)
|
||||
_dl_random = NULL;
|
||||
}
|
||||
|
||||
#include "setup-vdso.h"
|
||||
#include <setup-vdso.h>
|
||||
|
||||
/* The library search path. */
|
||||
static const char *library_path attribute_relro;
|
||||
@ -1538,6 +1540,9 @@ ERROR: '%s': cannot process note segment.\n", _dl_argv[0]);
|
||||
so they can influence _dl_init_paths. */
|
||||
setup_vdso (main_map, &first_preload);
|
||||
|
||||
/* With vDSO setup we can initialize the function pointers. */
|
||||
setup_vdso_pointers ();
|
||||
|
||||
#ifdef DL_SYSDEP_OSCHECK
|
||||
DL_SYSDEP_OSCHECK (_dl_fatal_printf);
|
||||
#endif
|
||||
|
Reference in New Issue
Block a user