<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-bts/+/18680">View Change</a></p><div style="white-space:pre-wrap">Approvals:
pespin: Looks good to me, but someone else must approve
laforge: Looks good to me, approved
Jenkins Builder: Verified
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">rsl: refactor handling of RSL_IE_MR_CONFIG<br><br> - get rid of gsm_lchan::mr_bts_lv, it's never used anyway,<br> - check IE length in amr_parse_mr_conf() before parsing,<br> - check return code of amr_parse_mr_conf().<br><br>Change-Id: Ibfd5845ea429945b352dd14421e86562998d65ca<br>---<br>M include/osmo-bts/gsm_data_shared.h<br>M src/common/amr.c<br>M src/common/rsl.c<br>3 files changed, 20 insertions(+), 21 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/include/osmo-bts/gsm_data_shared.h b/include/osmo-bts/gsm_data_shared.h</span><br><span>index f010dbc..dc7d39f 100644</span><br><span>--- a/include/osmo-bts/gsm_data_shared.h</span><br><span>+++ b/include/osmo-bts/gsm_data_shared.h</span><br><span>@@ -157,9 +157,6 @@</span><br><span> uint8_t key[MAX_A5_KEY_LEN];</span><br><span> } encr;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- /* AMR bits */</span><br><span style="color: hsl(0, 100%, 40%);">- uint8_t mr_bts_lv[7];</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> struct {</span><br><span> uint32_t bound_ip;</span><br><span> uint32_t connect_ip;</span><br><span>diff --git a/src/common/amr.c b/src/common/amr.c</span><br><span>index 05d1aaa..837757f 100644</span><br><span>--- a/src/common/amr.c</span><br><span>+++ b/src/common/amr.c</span><br><span>@@ -78,13 +78,16 @@</span><br><span> int amr_parse_mr_conf(struct amr_multirate_conf *amr_mrc,</span><br><span> const uint8_t *mr_conf, unsigned int len)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- uint8_t mr_version = mr_conf[0] >> 5;</span><br><span> uint8_t num_codecs = 0;</span><br><span> int i, j = 0;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (mr_version != 1) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DRSL, LOGL_ERROR, "AMR Multirate Version %u unknown\n",</span><br><span style="color: hsl(0, 100%, 40%);">- mr_version);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (len < 2) {</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DRSL, LOGL_ERROR, "AMR Multirate IE is too short (%u)\n", len);</span><br><span style="color: hsl(120, 100%, 40%);">+ goto ret_einval;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if ((mr_conf[0] >> 5) != 1) {</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DRSL, LOGL_ERROR, "AMR Multirate Version %u unknown\n", (mr_conf[0] >> 5));</span><br><span> goto ret_einval;</span><br><span> }</span><br><span> </span><br><span>diff --git a/src/common/rsl.c b/src/common/rsl.c</span><br><span>index 41dd243..f057a89 100644</span><br><span>--- a/src/common/rsl.c</span><br><span>+++ b/src/common/rsl.c</span><br><span>@@ -1209,17 +1209,16 @@</span><br><span> }</span><br><span> /* 9.3.52 MultiRate Configuration */</span><br><span> if (TLVP_PRESENT(&tp, RSL_IE_MR_CONFIG)) {</span><br><span style="color: hsl(0, 100%, 40%);">- if (TLVP_LEN(&tp, RSL_IE_MR_CONFIG) > sizeof(lchan->mr_bts_lv) - 1) {</span><br><span style="color: hsl(120, 100%, 40%);">+ rc = amr_parse_mr_conf(&lchan->tch.amr_mr,</span><br><span style="color: hsl(120, 100%, 40%);">+ TLVP_VAL(&tp, RSL_IE_MR_CONFIG),</span><br><span style="color: hsl(120, 100%, 40%);">+ TLVP_LEN(&tp, RSL_IE_MR_CONFIG));</span><br><span style="color: hsl(120, 100%, 40%);">+ if (rc < 0) {</span><br><span> LOGPLCHAN(lchan, DRSL, LOGL_ERROR, "Error parsing MultiRate conf IE\n");</span><br><span> rsl_tx_error_report(msg->trx, RSL_ERR_IE_CONTENT, &dch->chan_nr, NULL, msg);</span><br><span> return rsl_tx_chan_act_acknack(lchan, RSL_ERR_IE_CONTENT);</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">- memcpy(lchan->mr_bts_lv, TLVP_VAL(&tp, RSL_IE_MR_CONFIG) - 1,</span><br><span style="color: hsl(0, 100%, 40%);">- TLVP_LEN(&tp, RSL_IE_MR_CONFIG) + 1);</span><br><span style="color: hsl(0, 100%, 40%);">- amr_parse_mr_conf(&lchan->tch.amr_mr, TLVP_VAL(&tp, RSL_IE_MR_CONFIG),</span><br><span style="color: hsl(0, 100%, 40%);">- TLVP_LEN(&tp, RSL_IE_MR_CONFIG));</span><br><span style="color: hsl(0, 100%, 40%);">- amr_log_mr_conf(DRTP, LOGL_DEBUG, gsm_lchan_name(lchan),</span><br><span style="color: hsl(0, 100%, 40%);">- &lchan->tch.amr_mr);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ amr_log_mr_conf(DRTP, LOGL_DEBUG, gsm_lchan_name(lchan), &lchan->tch.amr_mr);</span><br><span> lchan->tch.last_cmr = AMR_CMR_NONE;</span><br><span> }</span><br><span> /* 9.3.53 MultiRate Control */</span><br><span>@@ -1556,6 +1555,7 @@</span><br><span> struct gsm_lchan *lchan = msg->lchan;</span><br><span> struct rsl_ie_chan_mode *cm;</span><br><span> struct tlv_parsed tp;</span><br><span style="color: hsl(120, 100%, 40%);">+ int rc;</span><br><span> </span><br><span> rsl_tlv_parse(&tp, msgb_l3(msg), msgb_l3len(msg));</span><br><span> </span><br><span>@@ -1588,17 +1588,16 @@</span><br><span> </span><br><span> /* 9.3.52 MultiRate Configuration */</span><br><span> if (TLVP_PRESENT(&tp, RSL_IE_MR_CONFIG)) {</span><br><span style="color: hsl(0, 100%, 40%);">- if (TLVP_LEN(&tp, RSL_IE_MR_CONFIG) > sizeof(lchan->mr_bts_lv) - 1) {</span><br><span style="color: hsl(120, 100%, 40%);">+ rc = amr_parse_mr_conf(&lchan->tch.amr_mr,</span><br><span style="color: hsl(120, 100%, 40%);">+ TLVP_VAL(&tp, RSL_IE_MR_CONFIG),</span><br><span style="color: hsl(120, 100%, 40%);">+ TLVP_LEN(&tp, RSL_IE_MR_CONFIG));</span><br><span style="color: hsl(120, 100%, 40%);">+ if (rc < 0) {</span><br><span> LOGPLCHAN(lchan, DRSL, LOGL_ERROR, "Error parsing MultiRate conf IE\n");</span><br><span> rsl_tx_error_report(msg->trx, RSL_ERR_IE_CONTENT, &dch->chan_nr, NULL, msg);</span><br><span> return rsl_tx_mode_modif_nack(lchan, RSL_ERR_IE_CONTENT);;</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">- memcpy(lchan->mr_bts_lv, TLVP_VAL(&tp, RSL_IE_MR_CONFIG) - 1,</span><br><span style="color: hsl(0, 100%, 40%);">- TLVP_LEN(&tp, RSL_IE_MR_CONFIG) + 1);</span><br><span style="color: hsl(0, 100%, 40%);">- amr_parse_mr_conf(&lchan->tch.amr_mr, TLVP_VAL(&tp, RSL_IE_MR_CONFIG),</span><br><span style="color: hsl(0, 100%, 40%);">- TLVP_LEN(&tp, RSL_IE_MR_CONFIG));</span><br><span style="color: hsl(0, 100%, 40%);">- amr_log_mr_conf(DRTP, LOGL_DEBUG, gsm_lchan_name(lchan),</span><br><span style="color: hsl(0, 100%, 40%);">- &lchan->tch.amr_mr);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ amr_log_mr_conf(DRTP, LOGL_DEBUG, gsm_lchan_name(lchan), &lchan->tch.amr_mr);</span><br><span> lchan->tch.last_cmr = AMR_CMR_NONE;</span><br><span> }</span><br><span> /* 9.3.53 MultiRate Control */</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-bts/+/18680">change 18680</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-bts/+/18680"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-bts </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: Ibfd5845ea429945b352dd14421e86562998d65ca </div>
<div style="display:none"> Gerrit-Change-Number: 18680 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </div>
<div style="display:none"> Gerrit-Owner: fixeria <vyanitskiy@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: fixeria <vyanitskiy@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-Reviewer: neels <nhofmeyr@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>