<p>neels has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-bsc/+/23912">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Lb: stop RESET FSM when sccp_user is unbound<br><br>A crash was reported in bssmap_le_tx_reset() sending a RESET with<br>sccp_user == NULL. Looking at the issue I noticed that when the<br>sccp_user is torn down, the RESET FSM should also be terminated.<br><br>Add bssmap_reset_term_and_free() to the generic RESET FSM implementation<br>and call from lb_stop() before sccp_user is set to NULL.<br><br>Related: OS#5134<br>Change-Id: If412ef990fcdde8ff88098a5169e86f05cd1c7f0<br>---<br>M include/osmocom/bsc/bssmap_reset.h<br>M src/osmo-bsc/bssmap_reset.c<br>M src/osmo-bsc/lb.c<br>M tests/handover/handover_test.c<br>4 files changed, 17 insertions(+), 0 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/12/23912/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/include/osmocom/bsc/bssmap_reset.h b/include/osmocom/bsc/bssmap_reset.h</span><br><span>index 560c543..f90f5ec 100644</span><br><span>--- a/include/osmocom/bsc/bssmap_reset.h</span><br><span>+++ b/include/osmocom/bsc/bssmap_reset.h</span><br><span>@@ -27,3 +27,4 @@</span><br><span> </span><br><span> struct bssmap_reset *bssmap_reset_alloc(void *ctx, const char *label, const struct bssmap_reset_cfg *cfg);</span><br><span> bool bssmap_reset_is_conn_ready(const struct bssmap_reset *bssmap_reset);</span><br><span style="color: hsl(120, 100%, 40%);">+void bssmap_reset_term_and_free(struct bssmap_reset *bssmap_reset);</span><br><span>diff --git a/src/osmo-bsc/bssmap_reset.c b/src/osmo-bsc/bssmap_reset.c</span><br><span>index fcf2bab..6c54560 100644</span><br><span>--- a/src/osmo-bsc/bssmap_reset.c</span><br><span>+++ b/src/osmo-bsc/bssmap_reset.c</span><br><span>@@ -70,6 +70,14 @@</span><br><span>         return bssmap_reset;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+void bssmap_reset_term_and_free(struct bssmap_reset *bssmap_reset)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+  if (!bssmap_reset)</span><br><span style="color: hsl(120, 100%, 40%);">+            return;</span><br><span style="color: hsl(120, 100%, 40%);">+       osmo_fsm_inst_term(bssmap_reset->fi, OSMO_FSM_TERM_REQUEST, NULL);</span><br><span style="color: hsl(120, 100%, 40%);">+ talloc_free(bssmap_reset);</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> static void link_up(struct bssmap_reset *bssmap_reset)</span><br><span> {</span><br><span>       LOGPFSML(bssmap_reset->fi, LOGL_NOTICE, "link up\n");</span><br><span>diff --git a/src/osmo-bsc/lb.c b/src/osmo-bsc/lb.c</span><br><span>index be7d446..0ff7c5c 100644</span><br><span>--- a/src/osmo-bsc/lb.c</span><br><span>+++ b/src/osmo-bsc/lb.c</span><br><span>@@ -399,6 +399,12 @@</span><br><span>   bsc_gsmnet->smlc->bssmap_reset = bssmap_reset_alloc(bsc_gsmnet, "Lb", &cfg);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+static void lb_stop_reset_fsm()</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ bssmap_reset_term_and_free(bsc_gsmnet->smlc->bssmap_reset);</span><br><span style="color: hsl(120, 100%, 40%);">+     bsc_gsmnet->smlc->bssmap_reset = NULL;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> static int lb_start()</span><br><span> {</span><br><span>      uint32_t default_pc;</span><br><span>@@ -482,6 +488,7 @@</span><br><span>   LOGP(DLCS, LOGL_INFO, "Shutting down Lb link\n");</span><br><span> </span><br><span>      lb_cancel_all();</span><br><span style="color: hsl(120, 100%, 40%);">+      lb_stop_reset_fsm();</span><br><span>         osmo_sccp_user_unbind(bsc_gsmnet->smlc->sccp_user);</span><br><span>    bsc_gsmnet->smlc->sccp_user = NULL;</span><br><span>    return 0;</span><br><span>diff --git a/tests/handover/handover_test.c b/tests/handover/handover_test.c</span><br><span>index 917372b..d2b1757 100644</span><br><span>--- a/tests/handover/handover_test.c</span><br><span>+++ b/tests/handover/handover_test.c</span><br><span>@@ -1405,6 +1405,7 @@</span><br><span> void osmo_bsc_sigtran_reset(void) {}</span><br><span> void bssmap_reset_alloc(void) {}</span><br><span> void bssmap_reset_is_conn_ready(void) {}</span><br><span style="color: hsl(120, 100%, 40%);">+void bssmap_reset_term_and_free(void) {}</span><br><span> const char *osmo_mgcpc_ep_name(const struct osmo_mgcpc_ep *ep)</span><br><span> {</span><br><span>      return "fake-ep";</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-bsc/+/23912">change 23912</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-bsc/+/23912"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: osmo-bsc </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: If412ef990fcdde8ff88098a5169e86f05cd1c7f0 </div>
<div style="display:none"> Gerrit-Change-Number: 23912 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: neels <nhofmeyr@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>