diff options
| author | Richard Mudgett <rmudgett@digium.com> | 2012-06-11 17:34:08 +0000 |
|---|---|---|
| committer | Richard Mudgett <rmudgett@digium.com> | 2012-06-11 17:34:08 +0000 |
| commit | 72eb8eb1e7ee0e097c1124a9c12cc984a670ee24 (patch) | |
| tree | c5ccd4f6f09127b22eeaf49b7f37585b1e48d723 /channels/chan_iax2.c | |
| parent | c6142cf2cc7312122abcf74d6ab1daf0ad1d72bf (diff) | |
Fix deadlock potential with ast_set_hangupsource() calls.
Calling ast_set_hangupsource() with the channel lock held can result in a
deadlock because the function also locks the bridged channel.
(issue ASTERISK-19537)
(closes issue AST-891)
Reported by: Guenther Kelleter
Tested by: Guenther Kelleter
(closes issue ASTERISK-19801)
Reported by: Alec Davis
........
Merged revisions 368759 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........
Merged revisions 368760 from http://svn.asterisk.org/svn/asterisk/branches/10
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@368772 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'channels/chan_iax2.c')
| -rw-r--r-- | channels/chan_iax2.c | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/channels/chan_iax2.c b/channels/chan_iax2.c index ade8438bd..467cdb4e3 100644 --- a/channels/chan_iax2.c +++ b/channels/chan_iax2.c @@ -9898,11 +9898,20 @@ static void set_hangup_source_and_cause(int callno, unsigned char causecode) { iax2_lock_owner(callno); if (iaxs[callno] && iaxs[callno]->owner) { + struct ast_channel *owner; + const char *name; + + owner = iaxs[callno]->owner; if (causecode) { - ast_channel_hangupcause_set(iaxs[callno]->owner, causecode); + ast_channel_hangupcause_set(owner, causecode); } - ast_set_hangupsource(iaxs[callno]->owner, ast_channel_name(iaxs[callno]->owner), 0); - ast_channel_unlock(iaxs[callno]->owner); + name = ast_strdupa(ast_channel_name(owner)); + ast_channel_ref(owner); + ast_channel_unlock(owner); + ast_mutex_unlock(&iaxsl[callno]); + ast_set_hangupsource(owner, name, 0); + ast_channel_unref(owner); + ast_mutex_lock(&iaxsl[callno]); } } |