<p>lynxis lazus <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/libosmocore/+/22197">View Change</a></p><div style="white-space:pre-wrap">Approvals:
daniel: Looks good to me, approved
Jenkins Builder: Verified
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">gprs_ns2: check if persistent nsei or nsvc exists when creating dynamic NSE<br><br>When receiving a NS Reset over an unknown NSVC the NS code would create<br>a dynamic NSE. If the NSEI or NSVCI is already configured to a<br>persistant NSE/NSVC the packet should be ignored.<br><br>Related: SYS#5208<br>Change-Id: I855911e7d364f2e5b08ea05857747aa63fcf1cd3<br>---<br>M src/gb/gprs_ns2.c<br>1 file changed, 34 insertions(+), 4 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/gb/gprs_ns2.c b/src/gb/gprs_ns2.c</span><br><span>index 3ca87a4..7f43cf0 100644</span><br><span>--- a/src/gb/gprs_ns2.c</span><br><span>+++ b/src/gb/gprs_ns2.c</span><br><span>@@ -861,18 +861,49 @@</span><br><span> return GPRS_NS2_CS_REJECTED;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- /* find or create NSE */</span><br><span> nsei = tlvp_val16be(&tp, NS_IE_NSEI);</span><br><span style="color: hsl(120, 100%, 40%);">+ nsvci = tlvp_val16be(&tp, NS_IE_VCI);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* find or create NSE */</span><br><span> nse = gprs_ns2_nse_by_nsei(bind->nsi, nsei);</span><br><span> if (!nse) {</span><br><span style="color: hsl(0, 100%, 40%);">- if (!bind->nsi->create_nse) {</span><br><span style="color: hsl(120, 100%, 40%);">+ /* only create nse for udp & ipaccess */</span><br><span style="color: hsl(120, 100%, 40%);">+ if (bind->ll != GPRS_NS2_LL_UDP || dialect != NS2_DIALECT_IPACCESS)</span><br><span> return GPRS_NS2_CS_SKIPPED;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!bind->nsi->create_nse || !bind->accept_ipaccess)</span><br><span style="color: hsl(120, 100%, 40%);">+ return GPRS_NS2_CS_SKIPPED;</span><br><span> </span><br><span> nse = gprs_ns2_create_nse(bind->nsi, nsei, bind->ll, dialect);</span><br><span> if (!nse) {</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DLNS, LOGL_ERROR, "Failed to create NSE(%05u)\n", nsei);</span><br><span> return GPRS_NS2_CS_ERROR;</span><br><span> }</span><br><span style="color: hsl(120, 100%, 40%);">+ } else {</span><br><span style="color: hsl(120, 100%, 40%);">+ /* nsei already known */</span><br><span style="color: hsl(120, 100%, 40%);">+ if (nse->ll != bind->ll) {</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DLNS, LOGL_ERROR, "Received NS-RESET NS-VCI(%05u) with wrong linklayer(%s) for already known NSE(%05u/%s)\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ nsei, gprs_ns2_lltype_str(bind->ll), nse->nsei, gprs_ns2_lltype_str(nse->ll));</span><br><span style="color: hsl(120, 100%, 40%);">+ return GPRS_NS2_CS_SKIPPED;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ nsvc = gprs_ns2_nsvc_by_nsvci(bind->nsi, nsvci);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (nsvc) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (nsvc->persistent) {</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DLNS, LOGL_ERROR, "Received NS-RESET for a persistent NSE(%05u) NS-VCI(%05u) over wrong connection.\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ nsei, nsvci);</span><br><span style="color: hsl(120, 100%, 40%);">+ return GPRS_NS2_CS_SKIPPED;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ /* destroy old dynamic nsvc */</span><br><span style="color: hsl(120, 100%, 40%);">+ gprs_ns2_free_nsvc(nsvc);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* do nse persistent check late to be more precise on the error message */</span><br><span style="color: hsl(120, 100%, 40%);">+ if (nse->persistent) {</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DLNS, LOGL_ERROR, "Received NS-RESET for a persistent NSE(%05u) but the unknown NS-VCI(%05u)\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ nsei, nsvci);</span><br><span style="color: hsl(120, 100%, 40%);">+ return GPRS_NS2_CS_SKIPPED;</span><br><span> }</span><br><span> </span><br><span> vc_mode = gprs_ns2_dialect_to_vc_mode(dialect);</span><br><span>@@ -880,7 +911,6 @@</span><br><span> if (!nsvc)</span><br><span> return GPRS_NS2_CS_SKIPPED;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- nsvci = tlvp_val16be(&tp, NS_IE_VCI);</span><br><span> nsvc->nsvci = nsvci;</span><br><span> nsvc->nsvci_is_valid = true;</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/libosmocore/+/22197">change 22197</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/libosmocore/+/22197"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: libosmocore </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I855911e7d364f2e5b08ea05857747aa63fcf1cd3 </div>
<div style="display:none"> Gerrit-Change-Number: 22197 </div>
<div style="display:none"> Gerrit-PatchSet: 3 </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: daniel <dwillmann@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-Reviewer: lynxis lazus <lynxis@fe80.eu> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>