<p>pespin has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-pcu/+/25221">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Revert "coverity: fix null deref from recent UL TBF leak fix"<br><br>This reverts commit 3bd648888910d8135e78c02b2f123163ac0ff2a3.<br><br>Change-Id: I59c4ae726286216850ad9b53fee34ab4bda5630f<br>---<br>M src/bts.cpp<br>1 file changed, 3 insertions(+), 6 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/21/25221/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/bts.cpp b/src/bts.cpp</span><br><span>index daa8ee1..0453e4e 100644</span><br><span>--- a/src/bts.cpp</span><br><span>+++ b/src/bts.cpp</span><br><span>@@ -1165,16 +1165,13 @@</span><br><span> {</span><br><span>      struct gprs_rlcmac_pdch *pdch = &bts->trx[trx_no].pdch[ts];</span><br><span>   struct pdch_ulc_node *poll = pdch_ulc_get_node(pdch->ulc, fn);</span><br><span style="color: hsl(0, 100%, 40%);">-       struct gprs_rlcmac_ul_tbf *ul_tbf;</span><br><span style="color: hsl(120, 100%, 40%);">+    struct gprs_rlcmac_ul_tbf *ul_tbf = as_ul_tbf(poll->tbf_poll.poll_tbf);</span><br><span>   if (!poll || poll->type !=PDCH_ULC_NODE_TBF_POLL ||</span><br><span style="color: hsl(0, 100%, 40%);">-      poll->tbf_poll.poll_tbf->direction != GPRS_RLCMAC_UL_TBF) {</span><br><span style="color: hsl(120, 100%, 40%);">+     poll->tbf_poll.poll_tbf->direction != GPRS_RLCMAC_UL_TBF)</span><br><span>          LOGP(DL1IF, LOGL_DEBUG, "[%s] update TA = %u ignored due to "</span><br><span>                   "unknown UL TBF on TRX = %d, TS = %d, FN = %d\n",</span><br><span>                  p, ta, trx_no, ts, fn);</span><br><span style="color: hsl(0, 100%, 40%);">-            return;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">-       ul_tbf = as_ul_tbf(poll->tbf_poll.poll_tbf);</span><br><span style="color: hsl(0, 100%, 40%);">- if (ul_tbf) {</span><br><span style="color: hsl(120, 100%, 40%);">+ else if (ul_tbf) {</span><br><span>           /* we need to distinguish TA information provided by L1</span><br><span>               * from PH-DATA-IND and PHY-RA-IND so that we can properly</span><br><span>            * update TA for given TBF</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-pcu/+/25221">change 25221</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/+/25221"/><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: I59c4ae726286216850ad9b53fee34ab4bda5630f </div>
<div style="display:none"> Gerrit-Change-Number: 25221 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-CC: Jenkins Builder </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>