<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-sgsn/+/20203">View Change</a></p><div style="white-space:pre-wrap">Approvals:
  Jenkins Builder: Verified
  laforge: Looks good to me, approved

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">gprs_llc: _bssgp_tx_dl_ud: ensure the LLME is valid before using it<br><br>In rare cases the LLME is NULL even when the mmctx is valid.<br>Ensure not accessing a NULL pointer.<br><br>Change-Id: Id9fdfb0d88264671546f8dfc4655032ff27bf43e<br>---<br>M src/sgsn/gprs_llc.c<br>1 file changed, 16 insertions(+), 12 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/sgsn/gprs_llc.c b/src/sgsn/gprs_llc.c</span><br><span>index 6e22e65..e357d16 100644</span><br><span>--- a/src/sgsn/gprs_llc.c</span><br><span>+++ b/src/sgsn/gprs_llc.c</span><br><span>@@ -376,20 +376,24 @@</span><br><span>    * not yet have a MMC context (e.g. XID negotiation of primarly</span><br><span>       * LLC connection from GMM sapi). */</span><br><span>         if (mmctx) {</span><br><span style="color: hsl(120, 100%, 40%);">+          /* In rare cases the LLME is NULL in those cases don't</span><br><span style="color: hsl(120, 100%, 40%);">+             * use the mm radio capabilities */</span><br><span>          dup.imsi = mmctx->imsi;</span><br><span style="color: hsl(0, 100%, 40%);">-              dup.drx_parms = mmctx->drx_parms;</span><br><span style="color: hsl(0, 100%, 40%);">-            dup.ms_ra_cap.len = mmctx->ms_radio_access_capa.len;</span><br><span style="color: hsl(0, 100%, 40%);">-         dup.ms_ra_cap.v = mmctx->ms_radio_access_capa.buf;</span><br><span style="color: hsl(120, 100%, 40%);">+         if (mmctx->gb.llme) {</span><br><span style="color: hsl(120, 100%, 40%);">+                      dup.drx_parms = mmctx->drx_parms;</span><br><span style="color: hsl(120, 100%, 40%);">+                  dup.ms_ra_cap.len = mmctx->ms_radio_access_capa.len;</span><br><span style="color: hsl(120, 100%, 40%);">+                       dup.ms_ra_cap.v = mmctx->ms_radio_access_capa.buf;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-               /* make sure we only send it to the right llme */</span><br><span style="color: hsl(0, 100%, 40%);">-               if (!(msgb_tlli(msg) == mmctx->gb.llme->tlli</span><br><span style="color: hsl(0, 100%, 40%);">-                    || msgb_tlli(msg) == mmctx->gb.llme->old_tlli)) {</span><br><span style="color: hsl(0, 100%, 40%);">-                   LOGP(DLLC, LOGL_ERROR,</span><br><span style="color: hsl(0, 100%, 40%);">-                       "_bssgp_tx_dl_ud(): Attempt to send Downlink Unitdata to wrong LLME:"</span><br><span style="color: hsl(0, 100%, 40%);">-                         " msgb_tlli=0x%x mmctx->gb.llme->tlli=0x%x ->old_tlli=0x%x\n",</span><br><span style="color: hsl(0, 100%, 40%);">-                       msgb_tlli(msg), mmctx->gb.llme->tlli, mmctx->gb.llme->old_tlli);</span><br><span style="color: hsl(0, 100%, 40%);">-                       msgb_free(msg);</span><br><span style="color: hsl(0, 100%, 40%);">-                 return -EINVAL;</span><br><span style="color: hsl(120, 100%, 40%);">+                       /* make sure we only send it to the right llme */</span><br><span style="color: hsl(120, 100%, 40%);">+                     if (!(msgb_tlli(msg) == mmctx->gb.llme->tlli</span><br><span style="color: hsl(120, 100%, 40%);">+                          || msgb_tlli(msg) == mmctx->gb.llme->old_tlli)) {</span><br><span style="color: hsl(120, 100%, 40%);">+                         LOGP(DLLC, LOGL_ERROR,</span><br><span style="color: hsl(120, 100%, 40%);">+                                     "_bssgp_tx_dl_ud(): Attempt to send Downlink Unitdata to wrong LLME:"</span><br><span style="color: hsl(120, 100%, 40%);">+                               " msgb_tlli=0x%x mmctx->gb.llme->tlli=0x%x ->old_tlli=0x%x\n",</span><br><span style="color: hsl(120, 100%, 40%);">+                                     msgb_tlli(msg), mmctx->gb.llme->tlli, mmctx->gb.llme->old_tlli);</span><br><span style="color: hsl(120, 100%, 40%);">+                             msgb_free(msg);</span><br><span style="color: hsl(120, 100%, 40%);">+                               return -EINVAL;</span><br><span style="color: hsl(120, 100%, 40%);">+                       }</span><br><span>            }</span><br><span>    }</span><br><span>    memcpy(&dup.qos_profile, qos_profile_default,</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-sgsn/+/20203">change 20203</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/osmo-sgsn/+/20203"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: osmo-sgsn </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: Id9fdfb0d88264671546f8dfc4655032ff27bf43e </div>
<div style="display:none"> Gerrit-Change-Number: 20203 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: lynxis lazus <lynxis@fe80.eu> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>