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

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">detect freed connections in osmo_stream_srv_read()<br><br>While we are processing a read event, the connection's<br>callback might free the connection. Check for this and don't<br>attempt to process further events on an already freed connection.<br><br>Change-Id: I0a9c7d8e3263c73440f7084dbb1792a4ca5038f0<br>Related: OS#3685<br>Depends: g#11704 (for libosmo-sccp)<br>---<br>M src/stream.c<br>1 file changed, 10 insertions(+), 7 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/stream.c b/src/stream.c</span><br><span>index 6eb2313..4548414 100644</span><br><span>--- a/src/stream.c</span><br><span>+++ b/src/stream.c</span><br><span>@@ -784,19 +784,21 @@</span><br><span>    int                             flags;</span><br><span> };</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static void osmo_stream_srv_read(struct osmo_stream_srv *conn)</span><br><span style="color: hsl(120, 100%, 40%);">+static int osmo_stream_srv_read(struct osmo_stream_srv *conn)</span><br><span> {</span><br><span style="color: hsl(120, 100%, 40%);">+    int rc = 0;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span>        LOGP(DLINP, LOGL_DEBUG, "message received\n");</span><br><span> </span><br><span>         if (conn->flags & OSMO_STREAM_SRV_F_FLUSH_DESTROY) {</span><br><span>          LOGP(DLINP, LOGL_DEBUG, "Connection is being flushed and closed; ignoring received message\n");</span><br><span style="color: hsl(0, 100%, 40%);">-               return;</span><br><span style="color: hsl(120, 100%, 40%);">+               return 0;</span><br><span>    }</span><br><span> </span><br><span>        if (conn->cb)</span><br><span style="color: hsl(0, 100%, 40%);">-                conn->cb(conn);</span><br><span style="color: hsl(120, 100%, 40%);">+            rc = conn->cb(conn);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-     return;</span><br><span style="color: hsl(120, 100%, 40%);">+       return rc;</span><br><span> }</span><br><span> </span><br><span> static void osmo_stream_srv_write(struct osmo_stream_srv *conn)</span><br><span>@@ -845,14 +847,15 @@</span><br><span> static int osmo_stream_srv_cb(struct osmo_fd *ofd, unsigned int what)</span><br><span> {</span><br><span>         struct osmo_stream_srv *conn = ofd->data;</span><br><span style="color: hsl(120, 100%, 40%);">+  int rc = 0;</span><br><span> </span><br><span>      LOGP(DLINP, LOGL_DEBUG, "connected read/write\n");</span><br><span>         if (what & BSC_FD_READ)</span><br><span style="color: hsl(0, 100%, 40%);">-             osmo_stream_srv_read(conn);</span><br><span style="color: hsl(0, 100%, 40%);">-     if (what & BSC_FD_WRITE)</span><br><span style="color: hsl(120, 100%, 40%);">+          rc = osmo_stream_srv_read(conn);</span><br><span style="color: hsl(120, 100%, 40%);">+      if (rc != -EBADF && (what & BSC_FD_WRITE))</span><br><span>               osmo_stream_srv_write(conn);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-        return 0;</span><br><span style="color: hsl(120, 100%, 40%);">+     return rc;</span><br><span> }</span><br><span> </span><br><span> /*! \brief Create a Stream Server inside the specified link</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/11705">change 11705</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/11705"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: libosmo-netif </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: I0a9c7d8e3263c73440f7084dbb1792a4ca5038f0 </div>
<div style="display:none"> Gerrit-Change-Number: 11705 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </div>
<div style="display:none"> Gerrit-Owner: Stefan Sperling <ssperling@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder (1000002) </div>
<div style="display:none"> Gerrit-Reviewer: Pau Espin Pedrol <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Stefan Sperling <ssperling@sysmocom.de> </div>