<p>lynxis lazus has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/10151">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">hnbgw: remove close_cb() to fix a crash when releasing a hnbgw<br><br>The read callback should catch all errors already.<br>Previous when a read fails it:<br><br>* hnb_context_release() -> osmo_stream_srv_destroy() -> hnb_context_release()<br>On the second hnb_context_release() the hnbgw will crash because calling<br>llist_del() twice on the same object.<br><br>Fixes: OS#3416<br>Change-Id: Ic84b2184b7fc850c0de2acacf179e86771e17510<br>---<br>M include/osmocom/iuh/hnbgw.h<br>M src/hnbgw.c<br>M src/hnbgw_hnbap.c<br>3 files changed, 8 insertions(+), 19 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-iuh refs/changes/51/10151/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/include/osmocom/iuh/hnbgw.h b/include/osmocom/iuh/hnbgw.h</span><br><span>index b79bcc1..db49dc1 100644</span><br><span>--- a/include/osmocom/iuh/hnbgw.h</span><br><span>+++ b/include/osmocom/iuh/hnbgw.h</span><br><span>@@ -161,7 +161,7 @@</span><br><span> void ue_context_free(struct ue_context *ue);</span><br><span> </span><br><span> struct hnb_context *hnb_context_alloc(struct hnb_gw *gw, struct osmo_stream_srv_link *link, int new_fd);</span><br><span style="color: hsl(0, 100%, 40%);">-void hnb_context_release(struct hnb_context *ctx, bool destroy_conn);</span><br><span style="color: hsl(120, 100%, 40%);">+void hnb_context_release(struct hnb_context *ctx);</span><br><span> </span><br><span> void hnbgw_vty_init(struct hnb_gw *gw, void *tall_ctx);</span><br><span> int hnbgw_vty_go_parent(struct vty *vty);</span><br><span>diff --git a/src/hnbgw.c b/src/hnbgw.c</span><br><span>index 94d8fb9..91e551b 100644</span><br><span>--- a/src/hnbgw.c</span><br><span>+++ b/src/hnbgw.c</span><br><span>@@ -202,16 +202,6 @@</span><br><span> llist_del(&ue->list);</span><br><span> talloc_free(ue);</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">-static int hnb_close_cb(struct osmo_stream_srv *conn)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- struct hnb_context *hnb = osmo_stream_srv_get_data(conn);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- /* This connection is about to be closed. Destroy the HNB context now. */</span><br><span style="color: hsl(0, 100%, 40%);">- if (hnb)</span><br><span style="color: hsl(0, 100%, 40%);">- hnb_context_release(hnb, false);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- return 0;</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span> </span><br><span> static int hnb_read_cb(struct osmo_stream_srv *conn)</span><br><span> {</span><br><span>@@ -234,10 +224,10 @@</span><br><span> } else if (rc < 0) {</span><br><span> LOGP(DMAIN, LOGL_ERROR, "Error during sctp_recvmsg()\n");</span><br><span> /* FIXME: clean up after disappeared HNB */</span><br><span style="color: hsl(0, 100%, 40%);">- hnb_context_release(hnb, true);</span><br><span style="color: hsl(120, 100%, 40%);">+ hnb_context_release(hnb);</span><br><span> goto out;</span><br><span> } else if (rc == 0) {</span><br><span style="color: hsl(0, 100%, 40%);">- hnb_context_release(hnb, true);</span><br><span style="color: hsl(120, 100%, 40%);">+ hnb_context_release(hnb);</span><br><span> rc = -1;</span><br><span> </span><br><span> goto out;</span><br><span>@@ -283,7 +273,7 @@</span><br><span> INIT_LLIST_HEAD(&ctx->map_list);</span><br><span> </span><br><span> ctx->gw = gw;</span><br><span style="color: hsl(0, 100%, 40%);">- ctx->conn = osmo_stream_srv_create(tall_hnb_ctx, link, new_fd, hnb_read_cb, hnb_close_cb, ctx);</span><br><span style="color: hsl(120, 100%, 40%);">+ ctx->conn = osmo_stream_srv_create(tall_hnb_ctx, link, new_fd, hnb_read_cb, NULL, ctx);</span><br><span> if (!ctx->conn) {</span><br><span> LOGP(DMAIN, LOGL_INFO, "error while creating connection\n");</span><br><span> talloc_free(ctx);</span><br><span>@@ -294,7 +284,7 @@</span><br><span> return ctx;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-void hnb_context_release(struct hnb_context *ctx, bool destroy_conn)</span><br><span style="color: hsl(120, 100%, 40%);">+void hnb_context_release(struct hnb_context *ctx)</span><br><span> {</span><br><span> struct hnbgw_context_map *map, *map2;</span><br><span> </span><br><span>@@ -312,8 +302,7 @@</span><br><span> }</span><br><span> ue_context_free_by_hnb(ctx->gw, ctx);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (destroy_conn)</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_stream_srv_destroy(ctx->conn);</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_stream_srv_destroy(ctx->conn);</span><br><span> </span><br><span> talloc_free(ctx);</span><br><span> }</span><br><span>diff --git a/src/hnbgw_hnbap.c b/src/hnbgw_hnbap.c</span><br><span>index acc5aff..2a19dda 100644</span><br><span>--- a/src/hnbgw_hnbap.c</span><br><span>+++ b/src/hnbgw_hnbap.c</span><br><span>@@ -84,7 +84,7 @@</span><br><span> osmo_stream_srv_set_flush_and_destroy(ctx->conn);</span><br><span> } else {</span><br><span> /* The message was not queued. Destroy the connection right away. */</span><br><span style="color: hsl(0, 100%, 40%);">- hnb_context_release(ctx, true);</span><br><span style="color: hsl(120, 100%, 40%);">+ hnb_context_release(ctx);</span><br><span> }</span><br><span> }</span><br><span> </span><br><span>@@ -401,7 +401,7 @@</span><br><span> hnbap_cause_str(&ies.cause));</span><br><span> </span><br><span> hnbap_free_hnbde_registeries(&ies);</span><br><span style="color: hsl(0, 100%, 40%);">- hnb_context_release(ctx, true);</span><br><span style="color: hsl(120, 100%, 40%);">+ hnb_context_release(ctx);</span><br><span> </span><br><span> return 0;</span><br><span> }</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/10151">change 10151</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/10151"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-iuh </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>
<div style="display:none"> Gerrit-Change-Id: Ic84b2184b7fc850c0de2acacf179e86771e17510 </div>
<div style="display:none"> Gerrit-Change-Number: 10151 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: lynxis lazus <lynxis@fe80.eu> </div>