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

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">gbproxy: Fix segfault when receiving PAGING for unknown destination<br><br>The 'nse' variable had been used both as the input argument of the<br>SGSN-side NSE, as well as a loop iteration variable.  Let's separate<br>this clearly.<br><br>Closes: OS#4904<br>Change-Id: I375a219cd72eb11a9a0cb7d55a3efb7b83b771ac<br>---<br>M src/gbproxy/gb_proxy.c<br>1 file changed, 7 insertions(+), 6 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/gbproxy/gb_proxy.c b/src/gbproxy/gb_proxy.c</span><br><span>index 5e6f238..a976d25 100644</span><br><span>--- a/src/gbproxy/gb_proxy.c</span><br><span>+++ b/src/gbproxy/gb_proxy.c</span><br><span>@@ -828,11 +828,12 @@</span><br><span> }</span><br><span> </span><br><span> /* Receive paging request from SGSN, we need to relay to proper BSS */</span><br><span style="color: hsl(0, 100%, 40%);">-static int gbprox_rx_paging(struct gbproxy_nse *nse, struct msgb *msg, const char *pdut_name,</span><br><span style="color: hsl(120, 100%, 40%);">+static int gbprox_rx_paging(struct gbproxy_nse *sgsn_nse, struct msgb *msg, const char *pdut_name,</span><br><span>                            struct tlv_parsed *tp, uint16_t ns_bvci)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">-       struct gbproxy_config *cfg = nse->cfg;</span><br><span style="color: hsl(120, 100%, 40%);">+     struct gbproxy_config *cfg = sgsn_nse->cfg;</span><br><span>       struct gbproxy_bvc *sgsn_bvc, *bss_bvc;</span><br><span style="color: hsl(120, 100%, 40%);">+       struct gbproxy_nse *nse;</span><br><span>     unsigned int n_nses = 0;</span><br><span>     int errctr = GBPROX_GLOB_CTR_PROTO_ERR_SGSN;</span><br><span>         int i, j;</span><br><span>@@ -842,9 +843,9 @@</span><br><span>      if (TLVP_PRES_LEN(tp, BSSGP_IE_BVCI, 2)) {</span><br><span>           uint16_t bvci = ntohs(tlvp_val16_unal(tp, BSSGP_IE_BVCI));</span><br><span>           errctr = GBPROX_GLOB_CTR_OTHER_ERR;</span><br><span style="color: hsl(0, 100%, 40%);">-             sgsn_bvc = gbproxy_bvc_by_bvci(nse, bvci);</span><br><span style="color: hsl(120, 100%, 40%);">+            sgsn_bvc = gbproxy_bvc_by_bvci(sgsn_nse, bvci);</span><br><span>              if (!sgsn_bvc) {</span><br><span style="color: hsl(0, 100%, 40%);">-                        LOGPNSE(nse, LOGL_NOTICE, "Rx %s: unable to route: BVCI=%05u unknown\n",</span><br><span style="color: hsl(120, 100%, 40%);">+                    LOGPNSE(sgsn_nse, LOGL_NOTICE, "Rx %s: unable to route: BVCI=%05u unknown\n",</span><br><span>                              pdut_name, bvci);</span><br><span>                    rate_ctr_inc(&cfg->ctrg->ctr[errctr]);</span><br><span>                     return -EINVAL;</span><br><span>@@ -893,12 +894,12 @@</span><br><span>                      }</span><br><span>            }</span><br><span>    } else {</span><br><span style="color: hsl(0, 100%, 40%);">-                LOGPNSE(nse, LOGL_ERROR, "BSSGP PAGING: unable to route, missing IE\n");</span><br><span style="color: hsl(120, 100%, 40%);">+            LOGPNSE(sgsn_nse, LOGL_ERROR, "BSSGP PAGING: unable to route, missing IE\n");</span><br><span>              rate_ctr_inc(&cfg->ctrg->ctr[errctr]);</span><br><span>     }</span><br><span> </span><br><span>        if (n_nses == 0) {</span><br><span style="color: hsl(0, 100%, 40%);">-              LOGPNSE(nse, LOGL_ERROR, "BSSGP PAGING: unable to route, no destination found\n");</span><br><span style="color: hsl(120, 100%, 40%);">+          LOGPNSE(sgsn_nse, LOGL_ERROR, "BSSGP PAGING: unable to route, no destination found\n");</span><br><span>            rate_ctr_inc(&cfg->ctrg->ctr[errctr]);</span><br><span>             return -EINVAL;</span><br><span>      }</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-sgsn/+/21693">change 21693</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/+/21693"/><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: I375a219cd72eb11a9a0cb7d55a3efb7b83b771ac </div>
<div style="display:none"> Gerrit-Change-Number: 21693 </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-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>