diff options
| author | Guy Martin <gmsoft@tuxicoman.be> | 2013-11-21 13:23:16 -0500 |
|---|---|---|
| committer | Carlos O'Donell <carlos@redhat.com> | 2013-11-21 15:52:31 -0500 |
| commit | daf75146de07303ea0c5ad700ec5ef703ec114a1 (patch) | |
| tree | ed307e39a90288cbcdf727a7c07addb9f38f65d8 /elf/dl-init.c | |
| parent | d33cafadfe365befa4ca6e0463fa926d56144046 (diff) | |
| download | glibc-daf75146de07303ea0c5ad700ec5ef703ec114a1.tar glibc-daf75146de07303ea0c5ad700ec5ef703ec114a1.tar.gz glibc-daf75146de07303ea0c5ad700ec5ef703ec114a1.tar.bz2 glibc-daf75146de07303ea0c5ad700ec5ef703ec114a1.zip | |
Don't use broken DL_AUTO_FUNCTION_ADDRESS()
On hppa and ia64, the macro DL_AUTO_FUNCTION_ADDRESS() uses the
variable fptr[2] in it's own scope.
The content of fptr[] is thus undefined right after the macro exits.
Newer gcc's (>= 4.7) reuse the stack space of this variable triggering
a segmentation fault in dl-init.c:69.
To fix this we rewrite the macros to make the call directly to init
and fini without needing to pass back a constructed function pointer.
Diffstat (limited to 'elf/dl-init.c')
| -rw-r--r-- | elf/dl-init.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/elf/dl-init.c b/elf/dl-init.c index a657eb6c40..40783684f2 100644 --- a/elf/dl-init.c +++ b/elf/dl-init.c @@ -61,13 +61,7 @@ call_init (struct link_map *l, int argc, char **argv, char **env) - the others in the DT_INIT_ARRAY. */ if (l->l_info[DT_INIT] != NULL) - { - init_t init = (init_t) DL_DT_INIT_ADDRESS - (l, l->l_addr + l->l_info[DT_INIT]->d_un.d_ptr); - - /* Call the function. */ - init (argc, argv, env); - } + DL_CALL_DT_INIT(l, l->l_addr + l->l_info[DT_INIT]->d_un.d_ptr, argc, argv, env); /* Next see whether there is an array with initialization functions. */ ElfW(Dyn) *init_array = l->l_info[DT_INIT_ARRAY]; |