Prevent deadlock in chan_iax2 when attempting to set caller ID

A deadlock can occur in chan_iax2 when it attempts to set the caller ID, as it
already holds the iax2 private lock and improperly fails to obtain the channel
lock before calling ast_set_callerid. By not safely obtaining the channel lock,
a locking inversion can take place, causing a deadlock.

This patch solves this by calling the required deadlock avoidance functions
that obtain the channel lock before setting the caller ID.

Thanks to Pavel for fixing my syntax errors and testing this patch out.

(closes issue ASTERISK-21128)
Reported by: Pavel Troller
Tested by: Pavel Troller
patches:
  ASTERISK-21128-1.8.diff uploaded by mjordan (license 6283)
  ASTERISK-21128-modified-1.8.diff uploaded by Pavel Troller (license 6302)
........

Merged revisions 382233 from http://svn.asterisk.org/svn/asterisk/branches/1.8

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/11@382234 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/channels/chan_iax2.c b/channels/chan_iax2.c
index 4769bf549ac50b8cd214d43503c191b9550410d6..13d25b7b052ba465c9663f2cd5ffb439ad178336 100644 (file)
--- a/channels/chan_iax2.c
+++ b/channels/chan_iax2.c
@@ -11744,13 +11744,15 @@ immediatedial:
                        ast_string_field_set(iaxs[fr->callno], cid_name, connected.id.name.str);
                        iaxs[fr->callno]->calling_pres = ast_party_id_presentation(&connected.id);
 
-                       if (iaxs[fr->callno]->owner) {
+                       iax2_lock_owner(fr->callno);
+                       if (iaxs[fr->callno] && iaxs[fr->callno]->owner) {
                                ast_set_callerid(iaxs[fr->callno]->owner,
                                        S_COR(connected.id.number.valid, connected.id.number.str, ""),
                                        S_COR(connected.id.name.valid, connected.id.name.str, ""),
                                        NULL);
                                ast_channel_caller(iaxs[fr->callno]->owner)->id.number.presentation = connected.id.number.presentation;
                                ast_channel_caller(iaxs[fr->callno]->owner)->id.name.presentation = connected.id.name.presentation;
+                               ast_channel_unlock(iaxs[fr->callno]->owner);
                        }
                }
                ast_party_connected_line_free(&connected);