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

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">om2k: Fix invalid use of linked list when building hopping freq list<br><br>I originally assumed that after a complete scan with llist_for_each_entry<br>the loop counter would be either NULL or a valid entry. That's just not<br>the case.<br><br>Fixes: CID#210256<br><br>Signed-off-by: Sylvain Munaut <tnt@246tNt.com><br>Change-Id: Iad647b74771c4ac406a88effd371ed7748c8847e<br>---<br>M src/osmo-bsc/abis_om2000.c<br>1 file changed, 6 insertions(+), 4 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/osmo-bsc/abis_om2000.c b/src/osmo-bsc/abis_om2000.c</span><br><span>index c696557..0aea684 100644</span><br><span>--- a/src/osmo-bsc/abis_om2000.c</span><br><span>+++ b/src/osmo-bsc/abis_om2000.c</span><br><span>@@ -1452,14 +1452,16 @@</span><br><span> </span><br><span> static int put_freq_list(uint8_t *buf, struct gsm_bts_trx_ts *ts, uint16_t arfcn)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">-  struct gsm_bts_trx *trx;</span><br><span style="color: hsl(120, 100%, 40%);">+      struct gsm_bts_trx *t, *trx = NULL;</span><br><span> </span><br><span>      /* Find the TRX that's configured for that ARFCN */</span><br><span style="color: hsl(0, 100%, 40%);">- llist_for_each_entry(trx, &ts->trx->bts->trx_list, list)</span><br><span style="color: hsl(0, 100%, 40%);">-           if (trx->arfcn == arfcn)</span><br><span style="color: hsl(120, 100%, 40%);">+   llist_for_each_entry(t, &ts->trx->bts->trx_list, list)</span><br><span style="color: hsl(120, 100%, 40%);">+           if (t->arfcn == arfcn) {</span><br><span style="color: hsl(120, 100%, 40%);">+                   trx = t;</span><br><span>                     break;</span><br><span style="color: hsl(120, 100%, 40%);">+                }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-   if (!trx || (trx->arfcn != arfcn)) {</span><br><span style="color: hsl(120, 100%, 40%);">+       if (!trx) {</span><br><span>          LOGP(DNM, LOGL_ERROR, "Trying to use ARFCN %d for hopping with no TRX configured for it", arfcn);</span><br><span>          return 0;</span><br><span>    }</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-bsc/+/18142">change 18142</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-bsc/+/18142"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: osmo-bsc </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: Iad647b74771c4ac406a88effd371ed7748c8847e </div>
<div style="display:none"> Gerrit-Change-Number: 18142 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </div>
<div style="display:none"> Gerrit-Owner: tnt <tnt@246tNt.com> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>