<p>neels has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-bsc/+/24652">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">rsl_data_request() check lchan pointer before access<br><br>fixup for commit 43aeeaf05ad814ccab0e93227b1248a20302c8ec<br>'RSL chan_nr: replace OSMO_ASSERT with error handling'<br>I71ed6437c403a3f9336e17a94b4948fca295d853<br><br>Related: CID#236319<br>Related: SYS#5315 OS#4940<br>Change-Id: I873c1a27f9449a56c525984ea50bfcf6daa4b5f8<br>---<br>M src/osmo-bsc/abis_rsl.c<br>1 file changed, 7 insertions(+), 5 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/52/24652/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/osmo-bsc/abis_rsl.c b/src/osmo-bsc/abis_rsl.c</span><br><span>index ac8006d..7525e31 100644</span><br><span>--- a/src/osmo-bsc/abis_rsl.c</span><br><span>+++ b/src/osmo-bsc/abis_rsl.c</span><br><span>@@ -939,11 +939,7 @@</span><br><span> /* Chapter 8.3.1 */</span><br><span> int rsl_data_request(struct msgb *msg, uint8_t link_id)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">-   int chan_nr = gsm_lchan2chan_nr(msg->lchan, true);</span><br><span style="color: hsl(0, 100%, 40%);">-   if (chan_nr < 0) {</span><br><span style="color: hsl(0, 100%, 40%);">-           msgb_free(msg);</span><br><span style="color: hsl(0, 100%, 40%);">-         return chan_nr;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(120, 100%, 40%);">+     int chan_nr;</span><br><span> </span><br><span>     if (msg->lchan == NULL) {</span><br><span>                 LOGP(DRSL, LOGL_ERROR, "cannot send DATA REQUEST to unknown lchan\n");</span><br><span>@@ -951,6 +947,12 @@</span><br><span>              return -EINVAL;</span><br><span>      }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ chan_nr = gsm_lchan2chan_nr(msg->lchan, true);</span><br><span style="color: hsl(120, 100%, 40%);">+     if (chan_nr < 0) {</span><br><span style="color: hsl(120, 100%, 40%);">+         msgb_free(msg);</span><br><span style="color: hsl(120, 100%, 40%);">+               return chan_nr;</span><br><span style="color: hsl(120, 100%, 40%);">+       }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span>  rsl_rll_push_l3(msg, RSL_MT_DATA_REQ, chan_nr, link_id, 1);</span><br><span> </span><br><span>      msg->dst = rsl_chan_link(msg->lchan);</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-bsc/+/24652">change 24652</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/+/24652"/><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: I873c1a27f9449a56c525984ea50bfcf6daa4b5f8 </div>
<div style="display:none"> Gerrit-Change-Number: 24652 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: neels <nhofmeyr@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>