dect
/
asterisk
Archived
13
0
Fork 0
Code Releases Activity

Fix deadlock issue in chan_zap with libss7 due to channel variables being set with the channel pvt lock being held. #12512 

git-svn-id: http://svn.digium.com/svn/asterisk/trunk@114776 f38db490-d61c-443f-a65b-d21fe96a405b
This commit is contained in:
mattf 2008-04-28 17:00:38 +00:00
parent ab1d90ba28
commit 0e7d4a984d
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
channels/chan_zap.c
View File

@ -9161,16 +9161,23 @@ static void ss7_start_call(struct zt_pvt *p, struct zt_ss7 *linkset)
ast_mutex_unlock(&linkset->lock);
c = zt_new(p, AST_STATE_RING, 1, SUB_REAL, law, 0);
ast_mutex_lock(&linkset->lock);
if (!c) {
ast_log(LOG_WARNING, "Unable to start PBX on CIC %d\n", p->cic);
/* Holding this lock is assumed entering the function */
ast_mutex_lock(&linkset->lock);
return;
} else
ast_verb(3, "Accepting call to '%s' on CIC %d\n", p->exten, p->cic);
zt_enable_ec(p);
/* We only reference these variables in the context of the ss7_linkset function
* when receiving either and IAM or a COT message. Since they are only accessed
* from this context, we should be safe to unlock around them */
ast_mutex_unlock(&p->lock);
if (!ast_strlen_zero(p->charge_number)) {
pbx_builtin_setvar_helper(c, "SS7_CHARGE_NUMBER", p->charge_number);
/* Clear this after we set it */
@ -9233,6 +9240,9 @@ static void ss7_start_call(struct zt_pvt *p, struct zt_ss7 *linkset)
/* Clear this after we set it */
p->generic_name[0] = 0;
}
ast_mutex_lock(&p->lock);
ast_mutex_lock(&linkset->lock);
}
static void ss7_apply_plan_to_number(char *buf, size_t size, const struct zt_ss7 *ss7, const char *number, const unsigned nai)