<p>Harald Welte <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/12871">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
Harald Welte: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">OML: Reject segmented OML messages<br><br>TS 12.21 describes segmenting of OML messages using placement<br>fist/middle/last and the "sequence' number of the OML header. We don't<br>implement this and hence must ignore or reject any related messages.<br><br>Before this patch however, we simply treated such segments as if they<br>were a complete OML message. Let's fix that.<br><br>Change-Id: Idd42cf4edc1bf9ab366853bd9b0f7afd9c060910<br>Closes: OS#3795<br>---<br>M src/common/oml.c<br>1 file changed, 9 insertions(+), 1 deletion(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/common/oml.c b/src/common/oml.c</span><br><span>index c98ba9c..d389e29 100644</span><br><span>--- a/src/common/oml.c</span><br><span>+++ b/src/common/oml.c</span><br><span>@@ -1424,7 +1424,7 @@</span><br><span> struct abis_om_hdr *oh = msgb_l2(msg);</span><br><span> int ret = 0;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (msgb_l2len(msg) < 1) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (msgb_l2len(msg) < sizeof(*oh)) {</span><br><span> oml_tx_failure_event_rep(&bts->mo, OSMO_EVT_MAJ_UKWN_MSG,</span><br><span> "OML message too short\n");</span><br><span> msgb_free(msg);</span><br><span>@@ -1432,6 +1432,14 @@</span><br><span> }</span><br><span> msg->l3h = (unsigned char *)oh + sizeof(*oh);</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ /* We don't implement de-segmentation of segmented OML messages */</span><br><span style="color: hsl(120, 100%, 40%);">+ if (oh->placement != ABIS_OM_PLACEMENT_ONLY || oh->sequence != 0) {</span><br><span style="color: hsl(120, 100%, 40%);">+ oml_tx_failure_event_rep(&bts->mo, OSMO_EVT_MAJ_UKWN_MSG,</span><br><span style="color: hsl(120, 100%, 40%);">+ "Unsupported segmented O&M message\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ msgb_free(msg);</span><br><span style="color: hsl(120, 100%, 40%);">+ return -EIO;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> switch (oh->mdisc) {</span><br><span> case ABIS_OM_MDISC_FOM:</span><br><span> if (msgb_l2len(msg) < sizeof(*oh)) {</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/12871">change 12871</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/12871"/><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: Idd42cf4edc1bf9ab366853bd9b0f7afd9c060910 </div>
<div style="display:none"> Gerrit-Change-Number: 12871 </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: Max <msuraev@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Pau Espin Pedrol <pespin@sysmocom.de> </div>