<p>Harald Welte <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/14101">View Change</a></p><div style="white-space:pre-wrap">Approvals:
  Jenkins Builder: Verified
  Vadim Yanitskiy: Looks good to me, approved

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">cbch: Fix memory leak and send error message on invalid SMSCB command<br><br>Change-Id: I411d1fb3693a2f7cf7bba3d38b1aaf276a4137ba<br>Related: OS#4011<br>---<br>M src/common/cbch.c<br>M src/common/rsl.c<br>2 files changed, 10 insertions(+), 3 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/common/cbch.c b/src/common/cbch.c</span><br><span>index 185386a..c75b510 100644</span><br><span>--- a/src/common/cbch.c</span><br><span>+++ b/src/common/cbch.c</span><br><span>@@ -182,6 +182,9 @@</span><br><span>                     talloc_free(scm);</span><br><span>            }</span><br><span>            break;</span><br><span style="color: hsl(120, 100%, 40%);">+        default:</span><br><span style="color: hsl(120, 100%, 40%);">+              talloc_free(scm);</span><br><span style="color: hsl(120, 100%, 40%);">+             return -EINVAL;</span><br><span>      }</span><br><span> </span><br><span>        return 0;</span><br><span>diff --git a/src/common/rsl.c b/src/common/rsl.c</span><br><span>index 76aaef3..8021d2d 100644</span><br><span>--- a/src/common/rsl.c</span><br><span>+++ b/src/common/rsl.c</span><br><span>@@ -487,6 +487,7 @@</span><br><span>         struct abis_rsl_cchan_hdr *cch = msgb_l2(msg);</span><br><span>       struct tlv_parsed tp;</span><br><span>        struct rsl_ie_cb_cmd_type *cb_cmd_type;</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>@@ -497,9 +498,12 @@</span><br><span>    cb_cmd_type = (struct rsl_ie_cb_cmd_type *)</span><br><span>                                  TLVP_VAL(&tp, RSL_IE_CB_CMD_TYPE);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-      return bts_process_smscb_cmd(trx->bts, *cb_cmd_type,</span><br><span style="color: hsl(0, 100%, 40%);">-                              TLVP_LEN(&tp, RSL_IE_SMSCB_MSG),</span><br><span style="color: hsl(0, 100%, 40%);">-                                    TLVP_VAL(&tp, RSL_IE_SMSCB_MSG));</span><br><span style="color: hsl(120, 100%, 40%);">+    rc = bts_process_smscb_cmd(trx->bts, *cb_cmd_type, TLVP_LEN(&tp, RSL_IE_SMSCB_MSG),</span><br><span style="color: hsl(120, 100%, 40%);">+                               TLVP_VAL(&tp, RSL_IE_SMSCB_MSG));</span><br><span style="color: hsl(120, 100%, 40%);">+      if (rc < 0)</span><br><span style="color: hsl(120, 100%, 40%);">+                return rsl_tx_error_report(trx, RSL_ERR_IE_CONTENT, &cch->chan_nr, NULL, msg);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+       return 0;</span><br><span> }</span><br><span> </span><br><span> /*! Prefix a given SACCH frame with a L2/LAPDm UI header and store it in given output buffer.</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/14101">change 14101</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/14101"/><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-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: I411d1fb3693a2f7cf7bba3d38b1aaf276a4137ba </div>
<div style="display:none"> Gerrit-Change-Number: 14101 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </div>
<div style="display:none"> Gerrit-Owner: Harald Welte <laforge@gnumonks.org> </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: Vadim Yanitskiy <axilirator@gmail.com> </div>