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

am 611fd2cc: Merge "Revert "Revert "add guard pages to the internal signal stacks"""

Browse Source 
* commit '611fd2cc91f79be6759f6e630e1e81998326dfe8':
  Revert "Revert "add guard pages to the internal signal stacks""
This commit is contained in:
Yabin Cui
2015-03-31 04:36:45 +00:00
committed by Android Git Automerger
parent 85f42bd31b 611fd2cc91
commit e58918f73a
3 changed files with 16 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
libc/bionic/pthread_create.cpp
View File

@@ -69,13 +69,20 @@ void __init_tls(pthread_internal_t* thread) {
void __init_alternate_signal_stack(pthread_internal_t* thread) { void __init_alternate_signal_stack(pthread_internal_t* thread) {
// Create and set an alternate signal stack. // Create and set an alternate signal stack.
stack_t ss; void* stack_base = mmap(NULL, SIGNAL_STACK_SIZE, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, -1, 0);
ss.ss_sp = mmap(NULL, SIGSTKSZ, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, -1, 0); if (stack_base != MAP_FAILED) {
if (ss.ss_sp != MAP_FAILED) {
ss.ss_size = SIGSTKSZ; // Create a guard page to catch stack overflows in signal handlers.
if (mprotect(stack_base, PAGE_SIZE, PROT_NONE) == -1) {
munmap(stack_base, SIGNAL_STACK_SIZE);
return;
}
stack_t ss;
ss.ss_sp = reinterpret_cast<uint8_t*>(stack_base) + PAGE_SIZE;
ss.ss_size = SIGNAL_STACK_SIZE - PAGE_SIZE;
ss.ss_flags = 0; ss.ss_flags = 0;
sigaltstack(&ss, NULL); sigaltstack(&ss, NULL);
thread->alternate_signal_stack = ss.ss_sp; thread->alternate_signal_stack = stack_base;
// We can only use const static allocated string for mapped region name, as Android kernel // We can only use const static allocated string for mapped region name, as Android kernel
// uses the string pointer directly when dumping /proc/pid/maps. // uses the string pointer directly when dumping /proc/pid/maps.

2
libc/bionic/pthread_exit.cpp
View File

@@ -87,7 +87,7 @@ void pthread_exit(void* return_value) {
sigaltstack(&ss, NULL); sigaltstack(&ss, NULL);
// Free it. // Free it.
munmap(thread->alternate_signal_stack, SIGSTKSZ); munmap(thread->alternate_signal_stack, SIGNAL_STACK_SIZE);
thread->alternate_signal_stack = NULL; thread->alternate_signal_stack = NULL;
} }

3
libc/bionic/pthread_internal.h
View File

@@ -130,6 +130,9 @@ __LIBC_HIDDEN__ void pthread_key_clean_all(void);
*/ */
#define PTHREAD_STACK_SIZE_DEFAULT ((1 * 1024 * 1024) - SIGSTKSZ) #define PTHREAD_STACK_SIZE_DEFAULT ((1 * 1024 * 1024) - SIGSTKSZ)
/* Leave room for a guard page in the internally created signal stacks. */
#define SIGNAL_STACK_SIZE (SIGSTKSZ + PAGE_SIZE)
/* Needed by fork. */ /* Needed by fork. */
__LIBC_HIDDEN__ extern void __bionic_atfork_run_prepare(); __LIBC_HIDDEN__ extern void __bionic_atfork_run_prepare();
__LIBC_HIDDEN__ extern void __bionic_atfork_run_child(); __LIBC_HIDDEN__ extern void __bionic_atfork_run_child();