diff options
| author | Vadim Yanitskiy <vyanitskiy@sysmocom.de> | 2021-04-16 20:55:50 +0200 |
|---|---|---|
| committer | Vadim Yanitskiy <vyanitskiy@sysmocom.de> | 2021-04-16 20:57:08 +0200 |
| commit | 976e7e51e6947674f200f3f73ab3065da357cfed (patch) | |
| tree | 42d2911efa0d535506a6c2ba8b0eadc99b008a95 /src | |
| parent | 479ff386ffd985e1583255717f491bdcc740795a (diff) | |
rsl: do not blindly ignore unhandled/unknown Channel Mode
Change-Id: I67a70132999be6580a29e6b814763309a6df4ae9
Related: SYS#4895
Diffstat (limited to 'src')
| -rw-r--r-- | src/common/rsl.c | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/src/common/rsl.c b/src/common/rsl.c index 525b6373..8488ab73 100644 --- a/src/common/rsl.c +++ b/src/common/rsl.c @@ -112,8 +112,8 @@ void gsm48_gen_starting_time(uint8_t *out, struct gsm_time *gtime) } /* compute lchan->rsl_cmode and lchan->tch_mode from RSL CHAN MODE IE */ -static void lchan_tchmode_from_cmode(struct gsm_lchan *lchan, - struct rsl_ie_chan_mode *cm) +static int lchan_tchmode_from_cmode(struct gsm_lchan *lchan, + const struct rsl_ie_chan_mode *cm) { lchan->rsl_cmode = cm->spd_ind; lchan->ts->trx->bts->dtxd = (cm->dtx_dtu & RSL_CMOD_DTXd) ? true : false; @@ -137,7 +137,11 @@ static void lchan_tchmode_from_cmode(struct gsm_lchan *lchan, case RSL_CMOD_SP_NT_6k0: lchan->tch_mode = GSM48_CMODE_DATA_6k0; break; + default: + return -ENOTSUP; } + + return 0; } @@ -1359,7 +1363,10 @@ static int rsl_rx_chan_activ(struct msgb *msg) return rsl_tx_chan_act_nack(lchan, RSL_ERR_MAND_IE_ERROR); } cm = (struct rsl_ie_chan_mode *) TLVP_VAL(&tp, RSL_IE_CHAN_MODE); - lchan_tchmode_from_cmode(lchan, cm); + if (lchan_tchmode_from_cmode(lchan, cm) != 0) { + LOGPLCHAN(lchan, DRSL, LOGL_NOTICE, "Unhandled RSL Channel Mode\n"); + return rsl_tx_chan_act_nack(lchan, RSL_ERR_IE_CONTENT); + } } /* 9.3.7 Encryption Information */ @@ -1874,7 +1881,10 @@ static int rsl_rx_mode_modif(struct msgb *msg) return rsl_tx_mode_modif_nack(lchan, RSL_ERR_MAND_IE_ERROR); } cm = (struct rsl_ie_chan_mode *) TLVP_VAL(&tp, RSL_IE_CHAN_MODE); - lchan_tchmode_from_cmode(lchan, cm); + if (lchan_tchmode_from_cmode(lchan, cm) != 0) { + LOGPLCHAN(lchan, DRSL, LOGL_NOTICE, "Unhandled RSL Channel Mode\n"); + return rsl_tx_mode_modif_nack(lchan, RSL_ERR_IE_CONTENT); + } if (bts_supports_cm(lchan->ts->trx->bts, ts_pchan(lchan->ts), lchan->tch_mode) != 1) { LOGPLCHAN(lchan, DRSL, LOGL_ERROR, "%s: invalid mode: %s (wrong BSC configuration?)\n", |