cellular-infrastructure
/
osmo-bsc
mirror of https://gerrit.osmocom.org/osmo-bsc
9
0
Fork 0
Code Issues Releases Wiki Activity

Lb: stop RESET FSM when sccp_user is unbound 

A crash was reported in bssmap_le_tx_reset() sending a RESET with
sccp_user == NULL. Looking at the issue I noticed that when the
sccp_user is torn down, the RESET FSM should also be terminated.

Add bssmap_reset_term_and_free() to the generic RESET FSM implementation
and call from lb_stop() before sccp_user is set to NULL.

Related: OS#5134
Change-Id: If412ef990fcdde8ff88098a5169e86f05cd1c7f0
This commit is contained in:
Neels Hofmeyr 2021-04-27 17:26:34 +02:00
parent 5979f2bcce
commit 18abd1a808
4 changed files with 17 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/osmocom/bsc/bssmap_reset.h
View File

@ -27,3 +27,4 @@ struct bssmap_reset {
struct bssmap_reset *bssmap_reset_alloc(void *ctx, const char *label, const struct bssmap_reset_cfg *cfg);
bool bssmap_reset_is_conn_ready(const struct bssmap_reset *bssmap_reset);
void bssmap_reset_term_and_free(struct bssmap_reset *bssmap_reset);

8
src/osmo-bsc/bssmap_reset.c
View File

@ -70,6 +70,14 @@ struct bssmap_reset *bssmap_reset_alloc(void *ctx, const char *label, const stru
return bssmap_reset;
}
void bssmap_reset_term_and_free(struct bssmap_reset *bssmap_reset)
{
if (!bssmap_reset)
return;
osmo_fsm_inst_term(bssmap_reset->fi, OSMO_FSM_TERM_REQUEST, NULL);
talloc_free(bssmap_reset);
}
static void link_up(struct bssmap_reset *bssmap_reset)
{
LOGPFSML(bssmap_reset->fi, LOGL_NOTICE, "link up\n");

7
src/osmo-bsc/lb.c
View File

@ -399,6 +399,12 @@ static void lb_start_reset_fsm()
bsc_gsmnet->smlc->bssmap_reset = bssmap_reset_alloc(bsc_gsmnet, "Lb", &cfg);
}
static void lb_stop_reset_fsm()
{
bssmap_reset_term_and_free(bsc_gsmnet->smlc->bssmap_reset);
bsc_gsmnet->smlc->bssmap_reset = NULL;
}
static int lb_start()
{
uint32_t default_pc;
@ -482,6 +488,7 @@ static int lb_stop()
LOGP(DLCS, LOGL_INFO, "Shutting down Lb link\n");
lb_cancel_all();
lb_stop_reset_fsm();
osmo_sccp_user_unbind(bsc_gsmnet->smlc->sccp_user);
bsc_gsmnet->smlc->sccp_user = NULL;
return 0;

1
tests/handover/handover_test.c
View File

@ -1405,6 +1405,7 @@ void osmo_bsc_sigtran_tx_reset_ack(void) {}
void osmo_bsc_sigtran_reset(void) {}
void bssmap_reset_alloc(void) {}
void bssmap_reset_is_conn_ready(void) {}
void bssmap_reset_term_and_free(void) {}
const char *osmo_mgcpc_ep_name(const struct osmo_mgcpc_ep *ep)
{
return "fake-ep";