generic-library/bionic
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

am bb897fa9: Merge "libc_init_static: apply relro earlier."

Browse Source 
* commit 'bb897fa9f79d25e4445fe3ab46b86657d6660c10':
  libc_init_static: apply relro earlier.
This commit is contained in:
Nick Kralevich
2013-01-14 10:25:16 -08:00
committed by Android Git Automerger
parent 375db86aea bb897fa9f7
commit 13bd37160e
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
libc/bionic/libc_init_static.c
View File

@@ -101,6 +101,8 @@ __noreturn void __libc_init(uintptr_t *elfdata,
/* Initialize the C runtime environment */ /* Initialize the C runtime environment */
__libc_init_common(elfdata); __libc_init_common(elfdata);
apply_gnu_relro();
/* Several Linux ABIs don't pass the onexit pointer, and the ones that /* Several Linux ABIs don't pass the onexit pointer, and the ones that
* do never use it. Therefore, we ignore it. * do never use it. Therefore, we ignore it.
*/ */
@@ -122,6 +124,5 @@ __noreturn void __libc_init(uintptr_t *elfdata,
if (structors->fini_array) if (structors->fini_array)
__cxa_atexit(__libc_fini,structors->fini_array,NULL); __cxa_atexit(__libc_fini,structors->fini_array,NULL);
apply_gnu_relro();
exit(slingshot(argc, argv, envp)); exit(slingshot(argc, argv, envp));
} }