<p>David Hajek has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.asterisk.org/10039">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">chan_sip.c:  chan_sip unstable with TLS after asterisk start or reloads<br><br>Fixes random asterisk crash on start or reload with TLS phones.<br><br>ASTERISK-28034  #close<br>Reported-by: David Hajek<br><br>Change-Id: I2a859f97dc80c348e2fa56e918214ee29521c4ac<br>---<br>M channels/chan_sip.c<br>1 file changed, 8 insertions(+), 3 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.asterisk.org:29418/asterisk refs/changes/39/10039/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/channels/chan_sip.c b/channels/chan_sip.c</span><br><span>index ad06422..2d3f885 100644</span><br><span>--- a/channels/chan_sip.c</span><br><span>+++ b/channels/chan_sip.c</span><br><span>@@ -2574,12 +2574,15 @@</span><br><span>   }</span><br><span> </span><br><span>        ao2_lock(tcptls_session);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-       if (!(th = ao2_t_find(threadt, &tmp, OBJ_POINTER, "ao2_find, getting sip_threadinfo in tcp helper thread")) ||</span><br><span style="color: hsl(120, 100%, 40%);">+  </span><br><span style="color: hsl(120, 100%, 40%);">+      // check stream isn't NULL</span><br><span style="color: hsl(120, 100%, 40%);">+        if (    (!tcptls_session->stream) ||</span><br><span style="color: hsl(120, 100%, 40%);">+               !(th = ao2_t_find(threadt, &tmp, OBJ_POINTER, "ao2_find, getting sip_threadinfo in tcp helper thread")) ||</span><br><span>             !(packet = ao2_alloc(sizeof(*packet), tcptls_packet_destructor)) ||</span><br><span>          !(packet->data = ast_str_create(len))) {</span><br><span>          goto tcptls_write_setup_error;</span><br><span>       }</span><br><span style="color: hsl(120, 100%, 40%);">+     </span><br><span> </span><br><span>         /* goto tcptls_write_error should _NOT_ be used beyond this point */</span><br><span>         ast_str_set(&packet->data, 0, "%s", (char *) buf);</span><br><span>@@ -3097,7 +3100,7 @@</span><br><span> </span><br><span>                      if (read(me->alert_pipe[0], &alert, sizeof(alert)) == -1) {</span><br><span>                           ast_log(LOG_ERROR, "read() failed: %s\n", strerror(errno));</span><br><span style="color: hsl(0, 100%, 40%);">-                           continue;</span><br><span style="color: hsl(120, 100%, 40%);">+                             goto cleanup; // read failed, usually Bad file descriptor, so go to cleanup to be safe</span><br><span>                       }</span><br><span> </span><br><span>                        switch (alert) {</span><br><span>@@ -3116,9 +3119,11 @@</span><br><span>                                    }</span><br><span>                                    ao2_t_ref(packet, -1, "tcptls packet sent, this is no longer needed");</span><br><span>                             }</span><br><span style="color: hsl(120, 100%, 40%);">+                             else goto cleanup; //frame_q is empty, nothing to write, go to cleanup to be safe</span><br><span>                            break;</span><br><span>                       default:</span><br><span>                             ast_log(LOG_ERROR, "Unknown tcptls thread alert '%u'\n", alert);</span><br><span style="color: hsl(120, 100%, 40%);">+                            goto cleanup; // weird things, go to cleanup to be safe</span><br><span>                      }</span><br><span>            }</span><br><span>    }</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.asterisk.org/10039">change 10039</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.asterisk.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.asterisk.org/10039"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: asterisk </div>
<div style="display:none"> Gerrit-Branch: 15.5 </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>
<div style="display:none"> Gerrit-Change-Id: I2a859f97dc80c348e2fa56e918214ee29521c4ac </div>
<div style="display:none"> Gerrit-Change-Number: 10039 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: David Hajek <david.hajek@daktela.com> </div>