<p>Vadim Yanitskiy <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/13899">View Change</a></p><div style="white-space:pre-wrap">Approvals:
  Jenkins Builder: Verified
  Harald Welte: Looks good to me, approved
  Neels Hofmeyr: Looks good to me, approved

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">hlr.c: check the presence of msgb->l2h in read_cb()<br><br>Checking the presence of msgb->l2h in read_cb_forward() doesn't<br>make sense, since in read_cb() we pass it to osmo_gsup_decode().<br>Let's rather do this before calling osmo_gsup_decode().<br><br>Fix for Change-Id: Ia4f345abc877baaf0a8f73b8988e6514d9589bf5<br>Change-Id: I69a3d31aacbbb1abef3d83e42e46c899fe2f914b<br>---<br>M src/hlr.c<br>1 file changed, 6 insertions(+), 6 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/hlr.c b/src/hlr.c</span><br><span>index 3df700a..84daa47 100644</span><br><span>--- a/src/hlr.c</span><br><span>+++ b/src/hlr.c</span><br><span>@@ -483,11 +483,6 @@</span><br><span>            goto end;</span><br><span>    }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-   if (!msgb_l2(msg) || !msgb_l2len(msg)) {</span><br><span style="color: hsl(0, 100%, 40%);">-                LOGP_GSUP_FWD(gsup, LOGL_ERROR, "missing or empty l2 data\n");</span><br><span style="color: hsl(0, 100%, 40%);">-                goto end;</span><br><span style="color: hsl(0, 100%, 40%);">-       }</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span>    /* Forward message without re-encoding (so we don't remove unknown IEs) */</span><br><span>       LOGP_GSUP_FWD(gsup, LOGL_INFO, "checks passed, forwarding\n");</span><br><span> </span><br><span>@@ -524,10 +519,15 @@</span><br><span>         static struct osmo_gsup_message gsup;</span><br><span>        int rc;</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+   if (!msgb_l2(msg) || !msgb_l2len(msg)) {</span><br><span style="color: hsl(120, 100%, 40%);">+              LOGP(DMAIN, LOGL_ERROR, "missing or empty L2 data\n");</span><br><span style="color: hsl(120, 100%, 40%);">+              return -EINVAL; /* FIXME: msgb_free(msg); */</span><br><span style="color: hsl(120, 100%, 40%);">+  }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span>  rc = osmo_gsup_decode(msgb_l2(msg), msgb_l2len(msg), &gsup);</span><br><span>     if (rc < 0) {</span><br><span>             LOGP(DMAIN, LOGL_ERROR, "error in GSUP decode: %d\n", rc);</span><br><span style="color: hsl(0, 100%, 40%);">-            return rc;</span><br><span style="color: hsl(120, 100%, 40%);">+            return rc; /* FIXME: msgb_free(msg); */</span><br><span>      }</span><br><span> </span><br><span>        /* 3GPP TS 23.003 Section 2.2 clearly states that an IMSI with less than 5</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/13899">change 13899</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/13899"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: osmo-hlr </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: I69a3d31aacbbb1abef3d83e42e46c899fe2f914b </div>
<div style="display:none"> Gerrit-Change-Number: 13899 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Vadim Yanitskiy <axilirator@gmail.com> </div>
<div style="display:none"> Gerrit-Reviewer: Harald Welte <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder (1000002) </div>
<div style="display:none"> Gerrit-Reviewer: Neels Hofmeyr <nhofmeyr@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Vadim Yanitskiy <axilirator@gmail.com> </div>