diff options
| author | Ulrich Drepper <drepper@redhat.com> | 2009-01-11 04:44:06 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 2009-01-11 04:44:06 +0000 |
| commit | 965cb60a21674edb8e20b1a2a41297bcd4622361 (patch) | |
| tree | 09300bc9d55e29ad73d7dde4ad75bb96cc51c103 /elf/dl-sysdep.c | |
| parent | 5b656a0d301740e1be7062f950d0a4f00c471434 (diff) | |
* sysdeps/generic/dl-osinfo.h (_dl_setup_stack_chk_guard): Take
one parameter. If non-NULL use it to initialize return value.
(_dl_setup_pointer_guard): New function.
* sysdeps/unix/sysv/linux/dl-osinfo.h: Likewise.
* sysdeps/generic/ldsodefs.h: Declare _dl_random.
* elf/rtld.c (security_init): Pass _dl_random to
_dl_setup_stack_chk_guard. Call _dl_setup_pointer_guard to initialize
pointer_chk_guard.
* elf/dl-sysdep.c (_dl_random): New variable.
(_dl_sysdep_start): Handle AT_RANDOM.
(_dl_show_auxv): Likewise.
* elf/dl-support.c (_dl_random): New variable.
(_dl_aux_init): Handle AT_RANDOM.
* csu/libc-start.c [!SHARED] (libc_start_main): Pass _dl_random
to _dl_setup_stack_chk_guard.
* elf/elf.h (AT_RANDOM): Define AT_BASE_PLATFORM and AT_RANDOM.
Diffstat (limited to 'elf/dl-sysdep.c')
| -rw-r--r-- | elf/dl-sysdep.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/elf/dl-sysdep.c b/elf/dl-sysdep.c index e6f4272a63..a44bee7086 100644 --- a/elf/dl-sysdep.c +++ b/elf/dl-sysdep.c @@ -1,5 +1,5 @@ /* Operating system support for run-time dynamic linker. Generic Unix version. - Copyright (C) 1995-1998, 2000-2007, 2008 Free Software Foundation, Inc. + Copyright (C) 1995-1998, 2000-2008, 2009 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -62,6 +62,7 @@ int __libc_multiple_libcs = 0; /* Defining this here avoids the inclusion void *__libc_stack_end attribute_relro = NULL; rtld_hidden_data_def(__libc_stack_end) static ElfW(auxv_t) *_dl_auxv attribute_relro; +void *_dl_random attribute_relro = NULL; #ifndef DL_FIND_ARG_COMPONENTS # define DL_FIND_ARG_COMPONENTS(cookie, argc, argv, envp, auxp) \ @@ -173,6 +174,9 @@ _dl_sysdep_start (void **start_argptr, GLRO(dl_sysinfo_dso) = (void *) av->a_un.a_val; break; #endif + case AT_RANDOM: + _dl_random = (void *) av->a_un.a_val; + break; #ifdef DL_PLATFORM_AUXV DL_PLATFORM_AUXV #endif @@ -294,6 +298,7 @@ _dl_show_auxv (void) [AT_SECURE - 2] = { "AT_SECURE: ", dec }, [AT_SYSINFO - 2] = { "AT_SYSINFO: 0x", hex }, [AT_SYSINFO_EHDR - 2] = { "AT_SYSINFO_EHDR: 0x", hex }, + [AT_RANDOM - 2] = { "AT_RANDOM: 0x", hex }, }; unsigned int idx = (unsigned int) (av->a_type - 2); |