<p>neels <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-msc/+/20201">View Change</a></p><div style="white-space:pre-wrap">Approvals:
  Jenkins Builder: Verified
  laforge: Looks good to me, approved

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">mncc_call: fix memory overrun<br><br>The struct gsm_mncc which is created and populated in mncc_call_tx_setup_ind<br>casted to a union mncc_msg* pointer. This leads to a memory overrun<br>in mncc_call_tx because the union mncc_msg is larger then the gsm_mncc struct.<br><br>To fix this, lets just declare a union mncc_msg and populate the signal<br>member inside it. This can be handed over to mncc_call_tx. The data in<br>it will look the same, except that the memory will have the proper<br>lenght (longer).<br><br>Change-Id: Ifff28b3375d6bd5e4f837f25c46736952f7bfa9b<br>Fixes: CID 214330<br>---<br>M src/libmsc/mncc_call.c<br>1 file changed, 9 insertions(+), 8 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/libmsc/mncc_call.c b/src/libmsc/mncc_call.c</span><br><span>index 9d52952..131620d 100644</span><br><span>--- a/src/libmsc/mncc_call.c</span><br><span>+++ b/src/libmsc/mncc_call.c</span><br><span>@@ -208,24 +208,25 @@</span><br><span> </span><br><span> static void mncc_call_tx_setup_ind(struct mncc_call *mncc_call)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">-        struct gsm_mncc mncc_msg = mncc_call->outgoing_req;</span><br><span style="color: hsl(0, 100%, 40%);">-  mncc_msg.msg_type = MNCC_SETUP_IND;</span><br><span style="color: hsl(0, 100%, 40%);">-     mncc_msg.callref = mncc_call->callref;</span><br><span style="color: hsl(120, 100%, 40%);">+     union mncc_msg mncc_msg;</span><br><span style="color: hsl(120, 100%, 40%);">+      mncc_msg.signal = mncc_call->outgoing_req;</span><br><span style="color: hsl(120, 100%, 40%);">+ mncc_msg.signal.msg_type = MNCC_SETUP_IND;</span><br><span style="color: hsl(120, 100%, 40%);">+    mncc_msg.signal.callref = mncc_call->callref;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-    OSMO_STRLCPY_ARRAY(mncc_msg.imsi, mncc_call->vsub->imsi);</span><br><span style="color: hsl(120, 100%, 40%);">+       OSMO_STRLCPY_ARRAY(mncc_msg.signal.imsi, mncc_call->vsub->imsi);</span><br><span> </span><br><span>   if (!(mncc_call->outgoing_req.fields & MNCC_F_CALLING)) {</span><br><span>             /* No explicit calling number set, use the local subscriber */</span><br><span style="color: hsl(0, 100%, 40%);">-          mncc_msg.fields |= MNCC_F_CALLING;</span><br><span style="color: hsl(0, 100%, 40%);">-              OSMO_STRLCPY_ARRAY(mncc_msg.calling.number, mncc_call->vsub->msisdn);</span><br><span style="color: hsl(120, 100%, 40%);">+           mncc_msg.signal.fields |= MNCC_F_CALLING;</span><br><span style="color: hsl(120, 100%, 40%);">+             OSMO_STRLCPY_ARRAY(mncc_msg.signal.calling.number, mncc_call->vsub->msisdn);</span><br><span> </span><br><span>       }</span><br><span>    mncc_call->local_msisdn_present = true;</span><br><span style="color: hsl(0, 100%, 40%);">-      mncc_call->local_msisdn = mncc_msg.calling;</span><br><span style="color: hsl(120, 100%, 40%);">+        mncc_call->local_msisdn = mncc_msg.signal.calling;</span><br><span> </span><br><span>    rate_ctr_inc(&gsmnet->msc_ctrs->ctr[MSC_CTR_CALL_MO_SETUP]);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-      mncc_call_tx(mncc_call, (union mncc_msg*)&mncc_msg);</span><br><span style="color: hsl(120, 100%, 40%);">+      mncc_call_tx(mncc_call, &mncc_msg);</span><br><span> }</span><br><span> </span><br><span> static void mncc_call_rx_setup_req(struct mncc_call *mncc_call, const struct gsm_mncc *incoming_req)</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-msc/+/20201">change 20201</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-msc/+/20201"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: osmo-msc </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: Ifff28b3375d6bd5e4f837f25c46736952f7bfa9b </div>
<div style="display:none"> Gerrit-Change-Number: 20201 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: dexter <pmaier@sysmocom.de> </div>
<div style="display:none"> Gerrit-Assignee: neels <nhofmeyr@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: dexter <pmaier@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-CC: neels <nhofmeyr@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>