f6ed9a5f2f
* Fix runtime error by pthread_equal() misuse. Changelog: NSPR 4.25 contains the following changes: - fixed reading files larger than 4 GB on Win32 - changes to NSPR test tools to allow them to run on our CI - added support for Xtensa architecture
108 lines
4.3 KiB
C
108 lines
4.3 KiB
C
$NetBSD: patch-nspr_pr_src_pthreads_ptsynch.c,v 1.1 2020/02/05 03:26:52 ryoon Exp $
|
|
|
|
* Do not use pthread_equal() for non-valid thread pointers.
|
|
From kamin@ on source-changes-d@NetBSD.org.
|
|
https://mail-index.netbsd.org/source-changes-d/2020/02/03/msg012143.html
|
|
|
|
--- nspr/pr/src/pthreads/ptsynch.c.orig 2020-01-31 20:37:50.000000000 +0000
|
|
+++ nspr/pr/src/pthreads/ptsynch.c
|
|
@@ -25,6 +25,13 @@ static pthread_condattr_t _pt_cvar_attr;
|
|
extern PTDebug pt_debug; /* this is shared between several modules */
|
|
#endif /* defined(DEBUG) */
|
|
|
|
+/* XXX, pthread_equal() is misused to compare non-valid thread pointers */
|
|
+static int
|
|
+pt_pthread_equal(pthread_t t1, pthread_t t2)
|
|
+{
|
|
+ return t1 == t2;
|
|
+}
|
|
+
|
|
#if defined(FREEBSD)
|
|
/*
|
|
* On older versions of FreeBSD, pthread_mutex_trylock returns EDEADLK.
|
|
@@ -197,9 +204,9 @@ PR_IMPLEMENT(PRStatus) PR_Unlock(PRLock
|
|
PR_ASSERT(lock != NULL);
|
|
PR_ASSERT(_PT_PTHREAD_MUTEX_IS_LOCKED(lock->mutex));
|
|
PR_ASSERT(PR_TRUE == lock->locked);
|
|
- PR_ASSERT(pthread_equal(lock->owner, self));
|
|
+ PR_ASSERT(pt_pthread_equal(lock->owner, self));
|
|
|
|
- if (!lock->locked || !pthread_equal(lock->owner, self)) {
|
|
+ if (!lock->locked || !pt_pthread_equal(lock->owner, self)) {
|
|
return PR_FAILURE;
|
|
}
|
|
|
|
@@ -225,7 +232,7 @@ PR_IMPLEMENT(void) PR_AssertCurrentThrea
|
|
* to the correctness of PR_AssertCurrentThreadOwnsLock(), but
|
|
* this particular order makes the assertion more likely to
|
|
* catch errors. */
|
|
- PR_ASSERT(lock->locked && pthread_equal(lock->owner, pthread_self()));
|
|
+ PR_ASSERT(lock->locked && pt_pthread_equal(lock->owner, pthread_self()));
|
|
}
|
|
|
|
/**************************************************************/
|
|
@@ -281,7 +288,7 @@ static void pt_PostNotifyToCvar(PRCondVa
|
|
_PT_Notified *notified = &cvar->lock->notified;
|
|
|
|
PR_ASSERT(PR_TRUE == cvar->lock->locked);
|
|
- PR_ASSERT(pthread_equal(cvar->lock->owner, pthread_self()));
|
|
+ PR_ASSERT(pt_pthread_equal(cvar->lock->owner, pthread_self()));
|
|
PR_ASSERT(_PT_PTHREAD_MUTEX_IS_LOCKED(cvar->lock->mutex));
|
|
|
|
while (1)
|
|
@@ -369,7 +376,7 @@ PR_IMPLEMENT(PRStatus) PR_WaitCondVar(PR
|
|
PR_ASSERT(_PT_PTHREAD_MUTEX_IS_LOCKED(cvar->lock->mutex));
|
|
PR_ASSERT(PR_TRUE == cvar->lock->locked);
|
|
/* and it better be by us */
|
|
- PR_ASSERT(pthread_equal(cvar->lock->owner, pthread_self()));
|
|
+ PR_ASSERT(pt_pthread_equal(cvar->lock->owner, pthread_self()));
|
|
|
|
if (_PT_THREAD_INTERRUPTED(thred)) {
|
|
goto aborted;
|
|
@@ -582,7 +589,7 @@ PR_IMPLEMENT(PRIntn) PR_GetMonitorEntryC
|
|
|
|
rv = pthread_mutex_lock(&mon->lock);
|
|
PR_ASSERT(0 == rv);
|
|
- if (pthread_equal(mon->owner, self)) {
|
|
+ if (pt_pthread_equal(mon->owner, self)) {
|
|
count = mon->entryCount;
|
|
}
|
|
rv = pthread_mutex_unlock(&mon->lock);
|
|
@@ -598,7 +605,7 @@ PR_IMPLEMENT(void) PR_AssertCurrentThrea
|
|
rv = pthread_mutex_lock(&mon->lock);
|
|
PR_ASSERT(0 == rv);
|
|
PR_ASSERT(mon->entryCount != 0 &&
|
|
- pthread_equal(mon->owner, pthread_self()));
|
|
+ pt_pthread_equal(mon->owner, pthread_self()));
|
|
rv = pthread_mutex_unlock(&mon->lock);
|
|
PR_ASSERT(0 == rv);
|
|
#endif
|
|
@@ -614,7 +621,7 @@ PR_IMPLEMENT(void) PR_EnterMonitor(PRMon
|
|
PR_ASSERT(0 == rv);
|
|
if (mon->entryCount != 0)
|
|
{
|
|
- if (pthread_equal(mon->owner, self)) {
|
|
+ if (pt_pthread_equal(mon->owner, self)) {
|
|
goto done;
|
|
}
|
|
while (mon->entryCount != 0)
|
|
@@ -646,8 +653,8 @@ PR_IMPLEMENT(PRStatus) PR_ExitMonitor(PR
|
|
PR_ASSERT(0 == rv);
|
|
/* the entries should be > 0 and we'd better be the owner */
|
|
PR_ASSERT(mon->entryCount > 0);
|
|
- PR_ASSERT(pthread_equal(mon->owner, self));
|
|
- if (mon->entryCount == 0 || !pthread_equal(mon->owner, self))
|
|
+ PR_ASSERT(pt_pthread_equal(mon->owner, self));
|
|
+ if (mon->entryCount == 0 || !pt_pthread_equal(mon->owner, self))
|
|
{
|
|
rv = pthread_mutex_unlock(&mon->lock);
|
|
PR_ASSERT(0 == rv);
|
|
@@ -695,7 +702,7 @@ PR_IMPLEMENT(PRStatus) PR_Wait(PRMonitor
|
|
/* the entries better be positive */
|
|
PR_ASSERT(mon->entryCount > 0);
|
|
/* and it better be owned by us */
|
|
- PR_ASSERT(pthread_equal(mon->owner, pthread_self()));
|
|
+ PR_ASSERT(pt_pthread_equal(mon->owner, pthread_self()));
|
|
|
|
/* tuck these away 'till later */
|
|
saved_entries = mon->entryCount;
|