system/freebsd-src
system/freebsd-src
1
0
Fork 0
mirror of https://github.com/freebsd/freebsd-src synced 2024-09-16 06:52:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Ensure thread library is initialized in pthread_testcancel().

Browse source 
Call _thr_check_init() before reading curthread in pthread_testcancel().

If a constructor in a library creates a semaphore via sem_init() and
then waits for it via sem_wait(), the program can core dump in
_pthread_testcancel() called from sem_wait().  This is because the
semaphore implementation lives in libc, so the library's constructors
can be run before libthr's constructors.

Reported by:	arichardson
Reviewed by:	kib
Obtained from:	CheriBSD
MFC after:	1 week
Sponsored by:	DARPA / AFRL
Differential Revision:	https://reviews.freebsd.org/D14786
This commit is contained in:
John Baldwin 2018-03-21 21:13:26 +00:00
parent dd388cfd9b
commit dc3566067a
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=331324
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/libthr/thread/thr_cancel.c
View file

@ -132,8 +132,10 @@ _pthread_setcanceltype(int type, int *oldtype)
void
_pthread_testcancel(void)
{
struct pthread *curthread = _get_curthread();
struct pthread *curthread;
_thr_check_init();
curthread = _get_curthread();
testcancel(curthread);
}