<p>Harald Welte <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/11629">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Neels Hofmeyr: Looks good to me, approved
Pau Espin Pedrol: Looks good to me, but someone else must approve
Jenkins Builder: Verified
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">check return value of gsm48_multirate_config()<br><br>Check the return value of gsm48_multirate_config() in function<br>lchan_set_single_amr_mode(). This prevents an invalid AMR mode<br>from being configured for a logical channel.<br><br>Because the VTY parsier limits the AMR mode range to 0-7 this<br>is just a theoretical issue. However, this fact is beyond the<br>understanding of a static code analyzer, and the absence of<br>error handling was indeed setting a bad example.<br><br>Change-Id: I61153a44e8b7a38332bf38718397be9b339d5f25<br>Related: CID#188940<br>---<br>M src/osmo-bsc/bsc_vty.c<br>1 file changed, 21 insertions(+), 6 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/osmo-bsc/bsc_vty.c b/src/osmo-bsc/bsc_vty.c</span><br><span>index b9a5268..f4f5838 100644</span><br><span>--- a/src/osmo-bsc/bsc_vty.c</span><br><span>+++ b/src/osmo-bsc/bsc_vty.c</span><br><span>@@ -4493,10 +4493,11 @@</span><br><span> }</span><br><span> </span><br><span> /* configure the lchan for a single AMR mode (as specified) */</span><br><span style="color: hsl(0, 100%, 40%);">-static int lchan_set_single_amr_mode(struct gsm_lchan *lchan, uint8_t amr_mode)</span><br><span style="color: hsl(120, 100%, 40%);">+static int lchan_set_single_amr_mode(struct vty *vty, struct gsm_lchan *lchan, uint8_t amr_mode)</span><br><span> {</span><br><span> struct amr_multirate_conf mr;</span><br><span> struct gsm48_multi_rate_conf *mr_conf;</span><br><span style="color: hsl(120, 100%, 40%);">+ int rc, vty_rc = CMD_SUCCESS;</span><br><span> mr_conf = (struct gsm48_multi_rate_conf *) &mr.gsm48_ie;</span><br><span> </span><br><span> if (amr_mode > 7)</span><br><span>@@ -4515,10 +4516,22 @@</span><br><span> </span><br><span> /* encode this configuration into the lchan for both uplink and</span><br><span> * downlink direction */</span><br><span style="color: hsl(0, 100%, 40%);">- gsm48_multirate_config(lchan->mr_ms_lv, mr_conf, mr.ms_mode, mr.num_modes);</span><br><span style="color: hsl(0, 100%, 40%);">- gsm48_multirate_config(lchan->mr_bts_lv, mr_conf, mr.bts_mode, mr.num_modes);</span><br><span style="color: hsl(120, 100%, 40%);">+ rc = gsm48_multirate_config(lchan->mr_ms_lv, mr_conf, mr.ms_mode, mr.num_modes);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (rc != 0) {</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty,</span><br><span style="color: hsl(120, 100%, 40%);">+ "Invalid AMR multirate configuration (%s, amr mode %d, ms) - check parameters%s",</span><br><span style="color: hsl(120, 100%, 40%);">+ gsm_lchant_name(lchan->type), amr_mode, VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_rc = CMD_WARNING;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ rc = gsm48_multirate_config(lchan->mr_bts_lv, mr_conf, mr.bts_mode, mr.num_modes);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (rc != 0) {</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty,</span><br><span style="color: hsl(120, 100%, 40%);">+ "Invalid AMR multirate configuration (%s, amr mode %d, bts) - check parameters%s",</span><br><span style="color: hsl(120, 100%, 40%);">+ gsm_lchant_name(lchan->type), amr_mode, VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_rc = CMD_WARNING;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- return 0;</span><br><span style="color: hsl(120, 100%, 40%);">+ return vty_rc;</span><br><span> }</span><br><span> </span><br><span> /* Debug/Measurement command to activate a given logical channel</span><br><span>@@ -4574,14 +4587,16 @@</span><br><span> else if (!strcmp(codec_str, "efr"))</span><br><span> lchan->tch_mode = GSM48_CMODE_SPEECH_EFR;</span><br><span> else if (!strcmp(codec_str, "amr")) {</span><br><span style="color: hsl(0, 100%, 40%);">- int amr_mode;</span><br><span style="color: hsl(120, 100%, 40%);">+ int amr_mode, vty_rc;</span><br><span> if (argc < 7) {</span><br><span> vty_out(vty, "%% AMR requires specification of AMR mode%s", VTY_NEWLINE);</span><br><span> return CMD_WARNING;</span><br><span> }</span><br><span> amr_mode = atoi(argv[6]);</span><br><span> lchan->tch_mode = GSM48_CMODE_SPEECH_AMR;</span><br><span style="color: hsl(0, 100%, 40%);">- lchan_set_single_amr_mode(lchan, amr_mode);</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_rc = lchan_set_single_amr_mode(vty, lchan, amr_mode);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (vty_rc != CMD_SUCCESS)</span><br><span style="color: hsl(120, 100%, 40%);">+ return vty_rc;</span><br><span> }</span><br><span> vty_out(vty, "%% activating lchan %s%s", gsm_lchan_name(lchan), VTY_NEWLINE);</span><br><span> rsl_tx_chan_activ(lchan, RSL_ACT_TYPE_INITIAL, 0);</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/11629">change 11629</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/11629"/><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-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: I61153a44e8b7a38332bf38718397be9b339d5f25 </div>
<div style="display:none"> Gerrit-Change-Number: 11629 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </div>
<div style="display:none"> Gerrit-Owner: Stefan Sperling <ssperling@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Harald Welte <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder (1000002) </div>
<div style="display:none"> Gerrit-Reviewer: Neels Hofmeyr <nhofmeyr@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Pau Espin Pedrol <pespin@sysmocom.de> </div>