From e137b23cb56f9f059a48c56a4ed0d592cb3aa355 Mon Sep 17 00:00:00 2001 From: Matthew Nicholson Date: Mon, 9 Nov 2009 14:48:56 +0000 Subject: [PATCH] Merged revisions 228858 via svnmerge from https://origsvn.digium.com/svn/asterisk/trunk ................ r228858 | mnicholson | 2009-11-09 08:37:07 -0600 (Mon, 09 Nov 2009) | 15 lines Merged revisions 228827 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r228827 | mnicholson | 2009-11-09 08:16:03 -0600 (Mon, 09 Nov 2009) | 8 lines Perform limited bounds checking when destroying ast_mutex_t structures to make sure we don't try to use negative indices. (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.6.2@228859 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- include/asterisk/lock.h | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/include/asterisk/lock.h b/include/asterisk/lock.h index 04901cdc9f..b09ff14b69 100644 --- a/include/asterisk/lock.h +++ b/include/asterisk/lock.h @@ -408,6 +408,7 @@ static inline int __ast_pthread_mutex_init(int tracking, const char *filename, i #define ast_mutex_init_notracking(pmutex) \ __ast_pthread_mutex_init(0, __FILE__, __LINE__, __PRETTY_FUNCTION__, #pmutex, pmutex) +#define ROFFSET ((lt->reentrancy > 0) ? (lt->reentrancy-1) : 0) static inline int __ast_pthread_mutex_destroy(const char *filename, int lineno, const char *func, const char *mutex_name, ast_mutex_t *t) { @@ -445,9 +446,9 @@ static inline int __ast_pthread_mutex_destroy(const char *filename, int lineno, filename, lineno, func, mutex_name); ast_reentrancy_lock(lt); __ast_mutex_logger("%s line %d (%s): Error: '%s' was locked here.\n", - lt->file[lt->reentrancy-1], lt->lineno[lt->reentrancy-1], lt->func[lt->reentrancy-1], mutex_name); + lt->file[ROFFSET], lt->lineno[ROFFSET], lt->func[ROFFSET], mutex_name); #ifdef HAVE_BKTR - __dump_backtrace(<->backtrace[lt->reentrancy-1], canlog); + __dump_backtrace(<->backtrace[ROFFSET], canlog); #endif ast_reentrancy_unlock(lt); break; @@ -538,10 +539,10 @@ static inline int __ast_pthread_mutex_lock(const char *filename, int lineno, con __dump_backtrace(<->backtrace[lt->reentrancy], canlog); #endif __ast_mutex_logger("%s line %d (%s): '%s' was locked here.\n", - lt->file[lt->reentrancy-1], lt->lineno[lt->reentrancy-1], - lt->func[lt->reentrancy-1], mutex_name); + lt->file[ROFFSET], lt->lineno[ROFFSET], + lt->func[ROFFSET], mutex_name); #ifdef HAVE_BKTR - __dump_backtrace(<->backtrace[lt->reentrancy-1], canlog); + __dump_backtrace(<->backtrace[ROFFSET], canlog); #endif ast_reentrancy_unlock(lt); reported_wait = wait_time; @@ -687,13 +688,13 @@ static inline int __ast_pthread_mutex_unlock(const char *filename, int lineno, c #endif /* AST_MUTEX_INIT_W_CONSTRUCTORS */ ast_reentrancy_lock(lt); - if (lt->reentrancy && (lt->thread[lt->reentrancy-1] != pthread_self())) { + if (lt->reentrancy && (lt->thread[ROFFSET] != pthread_self())) { __ast_mutex_logger("%s line %d (%s): attempted unlock mutex '%s' without owning it!\n", filename, lineno, func, mutex_name); __ast_mutex_logger("%s line %d (%s): '%s' was locked here.\n", - lt->file[lt->reentrancy-1], lt->lineno[lt->reentrancy-1], lt->func[lt->reentrancy-1], mutex_name); + lt->file[ROFFSET], lt->lineno[ROFFSET], lt->func[ROFFSET], mutex_name); #ifdef HAVE_BKTR - __dump_backtrace(<->backtrace[lt->reentrancy-1], canlog); + __dump_backtrace(<->backtrace[ROFFSET], canlog); #endif DO_THREAD_CRASH; } @@ -784,13 +785,13 @@ static inline int __ast_cond_wait(const char *filename, int lineno, const char * #endif /* AST_MUTEX_INIT_W_CONSTRUCTORS */ ast_reentrancy_lock(lt); - if (lt->reentrancy && (lt->thread[lt->reentrancy-1] != pthread_self())) { + if (lt->reentrancy && (lt->thread[ROFFSET] != pthread_self())) { __ast_mutex_logger("%s line %d (%s): attempted unlock mutex '%s' without owning it!\n", filename, lineno, func, mutex_name); __ast_mutex_logger("%s line %d (%s): '%s' was locked here.\n", - lt->file[lt->reentrancy-1], lt->lineno[lt->reentrancy-1], lt->func[lt->reentrancy-1], mutex_name); + lt->file[ROFFSET], lt->lineno[ROFFSET], lt->func[ROFFSET], mutex_name); #ifdef HAVE_BKTR - __dump_backtrace(<->backtrace[lt->reentrancy-1], canlog); + __dump_backtrace(<->backtrace[ROFFSET], canlog); #endif DO_THREAD_CRASH; } @@ -882,13 +883,13 @@ static inline int __ast_cond_timedwait(const char *filename, int lineno, const c #endif /* AST_MUTEX_INIT_W_CONSTRUCTORS */ ast_reentrancy_lock(lt); - if (lt->reentrancy && (lt->thread[lt->reentrancy-1] != pthread_self())) { + if (lt->reentrancy && (lt->thread[ROFFSET] != pthread_self())) { __ast_mutex_logger("%s line %d (%s): attempted unlock mutex '%s' without owning it!\n", filename, lineno, func, mutex_name); __ast_mutex_logger("%s line %d (%s): '%s' was locked here.\n", - lt->file[lt->reentrancy-1], lt->lineno[lt->reentrancy-1], lt->func[lt->reentrancy-1], mutex_name); + lt->file[ROFFSET], lt->lineno[ROFFSET], lt->func[ROFFSET], mutex_name); #ifdef HAVE_BKTR - __dump_backtrace(<->backtrace[lt->reentrancy-1], canlog); + __dump_backtrace(<->backtrace[ROFFSET], canlog); #endif DO_THREAD_CRASH; }