diff options
| author | Philip Guenthe <guenther@cvs.openbsd.org> | 2012-06-21 00:57:00 +0000 |
|---|---|---|
| committer | Philip Guenthe <guenther@cvs.openbsd.org> | 2012-06-21 00:57:00 +0000 |
| commit | 867c8588faf5fba418fc7c3a85aa2bd4c3327e01 (patch) | |
| tree | e98c388fcdff4a138a38722ee463c1b12f6c133a /lib/librthread | |
| parent | 28222fd1268ab97426703666e99f70ed942e847b (diff) | |
__tfork() needs to set the stack address of the new thread in the kernel,
so that it can't get a signal while still running on the parent thread's
stack. Also, pass in sizeof(struct __tfork) to provide forward compat
when more members are added. This is an ABI change, so switch syscall
numbers and bump lib majors this time.
ok deraadt@ matthew@
Diffstat (limited to 'lib/librthread')
| -rw-r--r-- | lib/librthread/rthread.c | 10 | ||||
| -rw-r--r-- | lib/librthread/shlib_version | 4 |
2 files changed, 6 insertions, 8 deletions
diff --git a/lib/librthread/rthread.c b/lib/librthread/rthread.c index f8f6605e726..27a9b6dbf72 100644 --- a/lib/librthread/rthread.c +++ b/lib/librthread/rthread.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rthread.c,v 1.61 2012/04/10 21:10:45 guenther Exp $ */ +/* $OpenBSD: rthread.c,v 1.62 2012/06/21 00:56:59 guenther Exp $ */ /* * Copyright (c) 2004,2005 Ted Unangst <tedu@openbsd.org> * All Rights Reserved. @@ -48,8 +48,6 @@ static _spinlock_lock_t _thread_gc_lock = _SPINLOCK_UNLOCKED; struct pthread _initial_thread; struct thread_control_block _initial_thread_tcb; -int __tfork_thread(const struct __tfork *, void *, void (*)(void *), void *); - struct pthread_attr _rthread_attr_default = { #ifndef lint .stack_addr = NULL, @@ -86,7 +84,7 @@ _spinunlock(_spinlock_lock_t *lock) /* * This sets up the thread base for the initial thread so that it * references the errno location provided by libc. For other threads - * this is handled by the block in _rthread_start(). + * this is handled by __tfork_thread() */ void _rthread_initlib(void) __attribute__((constructor)); void _rthread_initlib(void) @@ -415,7 +413,7 @@ pthread_create(pthread_t *threadp, const pthread_attr_t *attr, param.tf_tcb = tcb; param.tf_tid = &thread->tid; - param.tf_flags = 0; + param.tf_stack = thread->stack->sp; _spinlock(&_thread_lock); LIST_INSERT_HEAD(&_thread_list, thread, threads); @@ -423,7 +421,7 @@ pthread_create(pthread_t *threadp, const pthread_attr_t *attr, /* we're going to be multi-threaded real soon now */ __isthreaded = 1; - rc = __tfork_thread(¶m, thread->stack->sp, _rthread_start, thread); + rc = __tfork_thread(¶m, sizeof(param), _rthread_start, thread); if (rc != -1) { /* success */ *threadp = thread; diff --git a/lib/librthread/shlib_version b/lib/librthread/shlib_version index 998729533f3..84e2c2920d7 100644 --- a/lib/librthread/shlib_version +++ b/lib/librthread/shlib_version @@ -1,2 +1,2 @@ -major=15 -minor=2 +major=16 +minor=0 |