<p>keith has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-pcu/+/17634">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Don't check ul_control_block before decoding into it.<br><br>This patch corrects an error introduced in<br>6fd8ffb6fe62586a6880780678cbee3d9f97e763<br>That commit allowed us to send the data over GSMTAP even<br>if the Uplink Control Block had invalid content,<br>that is to say, if decode_gsm_rlcmac_uplink() returned error.<br><br>However the check for ul_control_block->u.MESSAGE_TYPE<br>was place before decode_gsm_rlcmac_uplink()<br><br>Change-Id: Ic47602e5c6a13571b92c0a939fc3514110b82444<br>---<br>M src/pdch.cpp<br>1 file changed, 1 insertion(+), 1 deletion(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/34/17634/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/pdch.cpp b/src/pdch.cpp</span><br><span>index 8560cb4..f3853c2 100644</span><br><span>--- a/src/pdch.cpp</span><br><span>+++ b/src/pdch.cpp</span><br><span>@@ -706,12 +706,12 @@</span><br><span> </span><br><span>         LOGP(DRLCMAC, LOGL_DEBUG, "+++++++++++++++++++++++++ RX : Uplink Control Block +++++++++++++++++++++++++\n");</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+   rc = decode_gsm_rlcmac_uplink(rlc_block, ul_control_block);</span><br><span>  if (ul_control_block->u.MESSAGE_TYPE == MT_PACKET_UPLINK_DUMMY_CONTROL_BLOCK)</span><br><span>             bts()->send_gsmtap(PCU_GSMTAP_C_UL_DUMMY, true, trx_no(), ts_no, GSMTAP_CHANNEL_PACCH, fn, data, data_len);</span><br><span>       else</span><br><span>                 bts()->send_gsmtap(PCU_GSMTAP_C_UL_CTRL, true, trx_no(), ts_no, GSMTAP_CHANNEL_PACCH, fn, data, data_len);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-       rc = decode_gsm_rlcmac_uplink(rlc_block, ul_control_block);</span><br><span>  if(rc < 0) {</span><br><span>              LOGP(DRLCMACUL, LOGL_ERROR, "Dropping Uplink Control Block with invalid "</span><br><span>               "content, decode failed: %d)\n", rc);</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-pcu/+/17634">change 17634</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-pcu/+/17634"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: osmo-pcu </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: Ic47602e5c6a13571b92c0a939fc3514110b82444 </div>
<div style="display:none"> Gerrit-Change-Number: 17634 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: keith <keith@rhizomatica.org> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>