AuroraMiddleware/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2024-12-12 22:30:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

(pthread_allocate_stack): Compute guard page address correctly.

Browse Source
This commit is contained in:
Ulrich Drepper 2000-01-19 00:13:49 +00:00
parent 72636075a2
commit 9898fc9149
1 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
linuxthreads/manager.c
View File

@ -289,9 +289,12 @@ static int pthread_allocate_stack(const pthread_attr_t *attr,
} }
else else
{ {
stacksize = STACK_SIZE - pagesize;
if (attr != NULL)
stacksize = MIN (stacksize, roundup(attr->__stacksize, pagesize));
/* Allocate space for stack and thread descriptor at default address */ /* Allocate space for stack and thread descriptor at default address */
new_thread = default_new_thread; new_thread = default_new_thread;
new_thread_bottom = (char *) new_thread - STACK_SIZE; new_thread_bottom = (char *) (new_thread + 1) - stacksize;
if (mmap((caddr_t)((char *)(new_thread + 1) - INITIAL_STACK_SIZE), if (mmap((caddr_t)((char *)(new_thread + 1) - INITIAL_STACK_SIZE),
INITIAL_STACK_SIZE, PROT_READ | PROT_WRITE | PROT_EXEC, INITIAL_STACK_SIZE, PROT_READ | PROT_WRITE | PROT_EXEC,
MAP_PRIVATE | MAP_ANONYMOUS | MAP_FIXED | MAP_GROWSDOWN, MAP_PRIVATE | MAP_ANONYMOUS | MAP_FIXED | MAP_GROWSDOWN,
@ -300,14 +303,10 @@ static int pthread_allocate_stack(const pthread_attr_t *attr,
return -1; return -1;
/* We manage to get a stack. Now see whether we need a guard /* We manage to get a stack. Now see whether we need a guard
and allocate it if necessary. Notice that the default and allocate it if necessary. Notice that the default
attributes (stack_size = STACK_SIZE - pagesize and attributes (stack_size = STACK_SIZE - pagesize) do not need
guardsize = pagesize) do not need a guard page, since a guard page, since the RLIMIT_STACK soft limit prevents stacks
the RLIMIT_STACK soft limit prevents stacks from from running into one another. */
running into one another. */ if (stacksize == STACK_SIZE - pagesize)
if (attr == NULL ||
attr->__guardsize == 0 ||
(attr->__guardsize == pagesize &&
attr->__stacksize == STACK_SIZE - pagesize))
{ {
/* We don't need a guard page. */ /* We don't need a guard page. */
guardaddr = NULL; guardaddr = NULL;
@ -316,11 +315,8 @@ static int pthread_allocate_stack(const pthread_attr_t *attr,
else else
{ {
/* Put a bad page at the bottom of the stack */ /* Put a bad page at the bottom of the stack */
stacksize = roundup(attr->__stacksize, pagesize);
if (stacksize >= STACK_SIZE - pagesize)
stacksize = STACK_SIZE - pagesize;
guardaddr = (void *)new_thread - stacksize;
guardsize = attr->__guardsize; guardsize = attr->__guardsize;
guardaddr = (void *)new_thread_bottom - guardsize;
if (mmap ((caddr_t) guardaddr, guardsize, 0, MAP_FIXED, -1, 0) if (mmap ((caddr_t) guardaddr, guardsize, 0, MAP_FIXED, -1, 0)
== MAP_FAILED) == MAP_FAILED)
{ {
@ -515,7 +511,7 @@ static void pthread_free(pthread_descr th)
/* One fewer threads in __pthread_handles */ /* One fewer threads in __pthread_handles */
__pthread_handles_num--; __pthread_handles_num--;
/* Destroy read lock list, and list of free read lock structures. /* Destroy read lock list, and list of free read lock structures.
If the former is not empty, it means the thread exited while If the former is not empty, it means the thread exited while
holding read locks! */ holding read locks! */