diff options
author | Adhemerval Zanella <adhemerval.zanella@linaro.org> | 2019-11-29 10:44:59 -0300 |
---|---|---|
committer | Adhemerval Zanella <adhemerval.zanella@linaro.org> | 2020-01-03 11:22:07 -0300 |
commit | 1bdda52fe92fd01b424cd6fbb63e3df96a95015c (patch) | |
tree | d25214e63bf5c96ab48c11ec0df28b5d96ca99da /sysdeps/generic/ldsodefs.h | |
parent | 57013650f7e796428ac2c0b7512757e99327bfc9 (diff) | |
download | glibc-1bdda52fe92fd01b424cd6fbb63e3df96a95015c.tar.gz glibc-1bdda52fe92fd01b424cd6fbb63e3df96a95015c.tar.xz glibc-1bdda52fe92fd01b424cd6fbb63e3df96a95015c.zip |
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>
Diffstat (limited to 'sysdeps/generic/ldsodefs.h')
-rw-r--r-- | sysdeps/generic/ldsodefs.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/sysdeps/generic/ldsodefs.h b/sysdeps/generic/ldsodefs.h index 0a5d3473f5..497938ffa2 100644 --- a/sysdeps/generic/ldsodefs.h +++ b/sysdeps/generic/ldsodefs.h @@ -608,6 +608,12 @@ struct rtld_global_ro /* At startup time we set up the normal DSO data structure for it, and this points to it. */ EXTERN struct link_map *_dl_sysinfo_map; + +# define PROCINFO_DECL +# ifndef PROCINFO_CLASS +# define PROCINFO_CLASS EXTERN +# endif +# include <dl-vdso-setup.c> #endif /* Mask for more hardware capabilities that are available on some |