diff options
| author | Ulrich Drepper <drepper@redhat.com> | 2009-11-24 11:17:06 -0800 |
|---|---|---|
| committer | Petr Baudis <pasky@ucw.cz> | 2009-12-04 14:47:33 +0100 |
| commit | 4f9d265e05056df279186d033af75352a679685f (patch) | |
| tree | 3555a825371edd072eded73501bc8c5a77b5365a /csu | |
| parent | b15f34af1c3b6f2658d3f73c331db8e94fa47b0a (diff) | |
| download | glibc-4f9d265e05056df279186d033af75352a679685f.tar.gz glibc-4f9d265e05056df279186d033af75352a679685f.tar.xz glibc-4f9d265e05056df279186d033af75352a679685f.zip | |
Fix startup to security-relevant statically linked binaries.
Before the change they crash on startup. Perform IREL relocations earlier to prevent this. (cherry picked from commit 1c3c269b55c84c29ec1e2c70f122c5e33fef4257)
Diffstat (limited to 'csu')
| -rw-r--r-- | csu/elf-init.c | 21 | ||||
| -rw-r--r-- | csu/libc-start.c | 6 |
2 files changed, 21 insertions, 6 deletions
diff --git a/csu/elf-init.c b/csu/elf-init.c index 1d2df62ca3..1e3d6d6cd8 100644 --- a/csu/elf-init.c +++ b/csu/elf-init.c @@ -72,15 +72,14 @@ extern void _fini (void); /* These functions are passed to __libc_start_main by the startup code. These get statically linked into each program. For dynamically linked programs, this module will come from libc_nonshared.a and differs from - the libc.a module in that it doesn't call the preinit array. */ + the libc.a module in that it doesn't call the preinit array and performs + explicit IREL{,A} relocations. */ -void -__libc_csu_init (int argc, char **argv, char **envp) -{ - /* For dynamically linked executables the preinit array is executed by - the dynamic linker (before initializing any shared object. */ #ifndef LIBC_NONSHARED +void +__libc_csu_irel (void) +{ # ifdef USE_MULTIARCH # ifdef ELF_MACHINE_IRELA { @@ -98,7 +97,17 @@ __libc_csu_init (int argc, char **argv, char **envp) } # endif # endif +} +#endif + +void +__libc_csu_init (int argc, char **argv, char **envp) +{ + /* For dynamically linked executables the preinit array is executed by + the dynamic linker (before initializing any shared object. */ + +#ifndef LIBC_NONSHARED /* For static executables, preinit happens right before init. */ { const size_t size = __preinit_array_end - __preinit_array_start; diff --git a/csu/libc-start.c b/csu/libc-start.c index 80b672f88d..dc7ca55f09 100644 --- a/csu/libc-start.c +++ b/csu/libc-start.c @@ -24,6 +24,9 @@ #include <bp-sym.h> extern void __libc_init_first (int argc, char **argv, char **envp); +#ifndef SHARED +extern void __libc_csu_irel (void); +#endif extern int __libc_multiple_libcs; @@ -134,6 +137,9 @@ LIBC_START_MAIN (int (*main) (int, char **, char ** MAIN_AUXVEC_DECL), } # endif + /* Performe IREL{,A} relocations. */ + __libc_csu_irel (); + /* Initialize the thread library at least a bit since the libgcc functions are using thread functions if these are available and we need to setup errno. */ |