kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-30 10:33:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Perform limited bounds checking when destroying ast_mutex_t structures to make sure we don't try to use negative indices.

Browse Source 
(closes issue #15588)
Reported by: zerohalo
Patches:
      20090820__issue15588.diff.txt uploaded by tilghman (license 14)
Tested by: zerohalo


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@228827 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Matthew Nicholson
2009-11-09 14:16:03 +00:00
parent 8939eece6a
commit a3887d4511
1 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
include/asterisk/lock.h
View File

@@ -289,6 +289,7 @@ static inline int __ast_pthread_mutex_init(int track, const char *filename, int
#define ast_mutex_init_notracking(pmutex) \ #define ast_mutex_init_notracking(pmutex) \
__ast_pthread_mutex_init(0, __FILE__, __LINE__, __PRETTY_FUNCTION__, #pmutex, pmutex) __ast_pthread_mutex_init(0, __FILE__, __LINE__, __PRETTY_FUNCTION__, #pmutex, pmutex)
#define ROFFSET ((t->reentrancy > 0) ? (t->reentrancy-1) : 0)
static inline int __ast_pthread_mutex_destroy(const char *filename, int lineno, const char *func, static inline int __ast_pthread_mutex_destroy(const char *filename, int lineno, const char *func,
const char *mutex_name, ast_mutex_t *t) const char *mutex_name, ast_mutex_t *t)
{ {
@@ -323,7 +324,7 @@ static inline int __ast_pthread_mutex_destroy(const char *filename, int lineno,
filename, lineno, func, mutex_name); filename, lineno, func, mutex_name);
ast_reentrancy_lock(t); ast_reentrancy_lock(t);
__ast_mutex_logger("%s line %d (%s): Error: '%s' was locked here.\n", __ast_mutex_logger("%s line %d (%s): Error: '%s' was locked here.\n",
t->file[t->reentrancy-1], t->lineno[t->reentrancy-1], t->func[t->reentrancy-1], mutex_name); t->file[ROFFSET], t->lineno[ROFFSET], t->func[ROFFSET], mutex_name);
ast_reentrancy_unlock(t); ast_reentrancy_unlock(t);
break; break;
} }
@@ -390,8 +391,8 @@ static inline int __ast_pthread_mutex_lock(const char *filename, int lineno, con
filename, lineno, func, (int) wait_time, mutex_name); filename, lineno, func, (int) wait_time, mutex_name);
ast_reentrancy_lock(t); ast_reentrancy_lock(t);
__ast_mutex_logger("%s line %d (%s): '%s' was locked here.\n", __ast_mutex_logger("%s line %d (%s): '%s' was locked here.\n",
t->file[t->reentrancy-1], t->lineno[t->reentrancy-1], t->file[ROFFSET], t->lineno[ROFFSET],
t->func[t->reentrancy-1], mutex_name); t->func[ROFFSET], mutex_name);
ast_reentrancy_unlock(t); ast_reentrancy_unlock(t);
reported_wait = wait_time; reported_wait = wait_time;
} }
@@ -501,11 +502,11 @@ static inline int __ast_pthread_mutex_unlock(const char *filename, int lineno, c
#endif /* AST_MUTEX_INIT_W_CONSTRUCTORS */ #endif /* AST_MUTEX_INIT_W_CONSTRUCTORS */
ast_reentrancy_lock(t); ast_reentrancy_lock(t);
if (t->reentrancy && (t->thread[t->reentrancy-1] != pthread_self())) { if (t->reentrancy && (t->thread[ROFFSET] != pthread_self())) {
__ast_mutex_logger("%s line %d (%s): attempted unlock mutex '%s' without owning it!\n", __ast_mutex_logger("%s line %d (%s): attempted unlock mutex '%s' without owning it!\n",
filename, lineno, func, mutex_name); filename, lineno, func, mutex_name);
__ast_mutex_logger("%s line %d (%s): '%s' was locked here.\n", __ast_mutex_logger("%s line %d (%s): '%s' was locked here.\n",
t->file[t->reentrancy-1], t->lineno[t->reentrancy-1], t->func[t->reentrancy-1], mutex_name); t->file[ROFFSET], t->lineno[ROFFSET], t->func[ROFFSET], mutex_name);
DO_THREAD_CRASH; DO_THREAD_CRASH;
} }
@@ -580,11 +581,11 @@ static inline int __ast_cond_wait(const char *filename, int lineno, const char *
#endif /* AST_MUTEX_INIT_W_CONSTRUCTORS */ #endif /* AST_MUTEX_INIT_W_CONSTRUCTORS */
ast_reentrancy_lock(t); ast_reentrancy_lock(t);
if (t->reentrancy && (t->thread[t->reentrancy-1] != pthread_self())) { if (t->reentrancy && (t->thread[ROFFSET] != pthread_self())) {
__ast_mutex_logger("%s line %d (%s): attempted unlock mutex '%s' without owning it!\n", __ast_mutex_logger("%s line %d (%s): attempted unlock mutex '%s' without owning it!\n",
filename, lineno, func, mutex_name); filename, lineno, func, mutex_name);
__ast_mutex_logger("%s line %d (%s): '%s' was locked here.\n", __ast_mutex_logger("%s line %d (%s): '%s' was locked here.\n",
t->file[t->reentrancy-1], t->lineno[t->reentrancy-1], t->func[t->reentrancy-1], mutex_name); t->file[ROFFSET], t->lineno[ROFFSET], t->func[ROFFSET], mutex_name);
DO_THREAD_CRASH; DO_THREAD_CRASH;
} }
@@ -651,11 +652,11 @@ static inline int __ast_cond_timedwait(const char *filename, int lineno, const c
#endif /* AST_MUTEX_INIT_W_CONSTRUCTORS */ #endif /* AST_MUTEX_INIT_W_CONSTRUCTORS */
ast_reentrancy_lock(t); ast_reentrancy_lock(t);
if (t->reentrancy && (t->thread[t->reentrancy-1] != pthread_self())) { if (t->reentrancy && (t->thread[ROFFSET] != pthread_self())) {
__ast_mutex_logger("%s line %d (%s): attempted unlock mutex '%s' without owning it!\n", __ast_mutex_logger("%s line %d (%s): attempted unlock mutex '%s' without owning it!\n",
filename, lineno, func, mutex_name); filename, lineno, func, mutex_name);
__ast_mutex_logger("%s line %d (%s): '%s' was locked here.\n", __ast_mutex_logger("%s line %d (%s): '%s' was locked here.\n",
t->file[t->reentrancy-1], t->lineno[t->reentrancy-1], t->func[t->reentrancy-1], mutex_name); t->file[ROFFSET], t->lineno[ROFFSET], t->func[ROFFSET], mutex_name);
DO_THREAD_CRASH; DO_THREAD_CRASH;
} }