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

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">fix error handling gprs_ns_nsip_listen()<br><br>If we cannot bind the listening socket, reset related fields in<br>the osmo fd structure to NULL again. Otherwise our caller might<br>eventually try to use an uninitialized osmo fd.<br><br>Change-Id: Ia953b2eff54cac0bd980944291f75db14df09a34<br>Related: OS#3643<br>---<br>M src/gb/gprs_ns.c<br>1 file changed, 4 insertions(+), 1 deletion(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/gb/gprs_ns.c b/src/gb/gprs_ns.c</span><br><span>index 9b7cc05..198ead1 100644</span><br><span>--- a/src/gb/gprs_ns.c</span><br><span>+++ b/src/gb/gprs_ns.c</span><br><span>@@ -1628,8 +1628,11 @@</span><br><span>              LOGP(DNS, LOGL_NOTICE, "Listening for nsip packets on %s:%u\n", inet_ntoa(in), nsi->nsip.local_port);</span><br><span>   }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-   if (ret < 0)</span><br><span style="color: hsl(120, 100%, 40%);">+       if (ret < 0) {</span><br><span style="color: hsl(120, 100%, 40%);">+             nsi->nsip.fd.cb = NULL;</span><br><span style="color: hsl(120, 100%, 40%);">+            nsi->nsip.fd.data = NULL;</span><br><span>                 return ret;</span><br><span style="color: hsl(120, 100%, 40%);">+   }</span><br><span> </span><br><span>        ret = setsockopt(nsi->nsip.fd.fd, IPPROTO_IP, IP_TOS,</span><br><span>                             &nsi->nsip.dscp, sizeof(nsi->nsip.dscp));</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/11300">change 11300</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/11300"/><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-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: Ia953b2eff54cac0bd980944291f75db14df09a34 </div>
<div style="display:none"> Gerrit-Change-Number: 11300 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Stefan Sperling <ssperling@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Harald Welte <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder (1000002) </div>