<p>laforge has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/libosmo-sccp/+/15813">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">ipa: Fix crash when parsing of received IPA SCCP message fails<br><br>If an IPA ASP is sending us a SCCP message that cannot be parsed,<br>we shouldn't crash but handle this gracefully.<br><br>While at it, also add some more logging to various realted error paths.<br><br>Change-Id: Ib7a8c2a36dd1b82ca8ed472760c1682ede50cb90<br>Fixes: OS#4236<br>---<br>M src/ipa.c<br>1 file changed, 8 insertions(+), 0 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/libosmo-sccp refs/changes/13/15813/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/ipa.c b/src/ipa.c</span><br><span>index d013916..bae88ac 100644</span><br><span>--- a/src/ipa.c</span><br><span>+++ b/src/ipa.c</span><br><span>@@ -178,6 +178,7 @@</span><br><span>              xua_msg_add_sccp_addr(sua, SUA_IEI_DEST_ADDR, &addr);</span><br><span>            break;</span><br><span>       case -ENODEV: /* no destination address in message */</span><br><span style="color: hsl(120, 100%, 40%);">+         LOGPASP(asp, DLSS7, LOGL_ERROR, "No destinatin address in SUA\n");</span><br><span>                 break;</span><br><span>       default: /* some other error */</span><br><span>              xua_msg_free(sua);</span><br><span>@@ -196,6 +197,7 @@</span><br><span>             xua_msg_add_sccp_addr(sua, SUA_IEI_SRC_ADDR, &addr);</span><br><span>             break;</span><br><span>       case -ENODEV: /* no source address in message */</span><br><span style="color: hsl(120, 100%, 40%);">+              LOGPASP(asp, DLSS7, LOGL_ERROR, "No source address in SUA\n");</span><br><span>             break;</span><br><span>       default: /* some other error */</span><br><span>              xua_msg_free(sua);</span><br><span>@@ -204,6 +206,8 @@</span><br><span> </span><br><span>         /* re-encode SUA to SCCP and return */</span><br><span>       sccp_msg_out = osmo_sua_to_sccp(sua);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!sccp_msg_out)</span><br><span style="color: hsl(120, 100%, 40%);">+            LOGPASP(asp, DLSS7, LOGL_ERROR, "Couldn't re-encode SUA to SCCP\n");</span><br><span>   xua_msg_free(sua);</span><br><span>   return sccp_msg_out;</span><br><span> }</span><br><span>@@ -259,6 +263,10 @@</span><br><span> </span><br><span>         /* Second, patch this into the SCCP message */</span><br><span>       msg = patch_sccp_with_pc(asp, msg, opc, dpc);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!msg) {</span><br><span style="color: hsl(120, 100%, 40%);">+           LOGPASP(asp, DLSS7, LOGL_ERROR, "Unable to patch PC into SCCP message; dropping\n");</span><br><span style="color: hsl(120, 100%, 40%);">+                return -1;</span><br><span style="color: hsl(120, 100%, 40%);">+    }</span><br><span> </span><br><span>        /* Third, create a MTP3/M3UA label with those point codes */</span><br><span>         memset(&data_hdr, 0, sizeof(data_hdr));</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/libosmo-sccp/+/15813">change 15813</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.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.osmocom.org/c/libosmo-sccp/+/15813"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: libosmo-sccp </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: Ib7a8c2a36dd1b82ca8ed472760c1682ede50cb90 </div>
<div style="display:none"> Gerrit-Change-Number: 15813 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>