<p>pespin <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-bts/+/26362">View Change</a></p><div style="white-space:pre-wrap">Approvals:
  daniel: Looks good to me, but someone else must approve
  pespin: Looks good to me, approved
  Jenkins Builder: Verified

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">[lc15,oc2g,octphy] Fix memory leak on write queue overflow<br><br>Callers of osmo_wqueue_enqueue must always check the return value<br>and free the message themselves in the error case.<br><br>Change-Id: Ic67fbef23e419c0c8a7bcfb16d134e1bf649de72<br>Related: OS#5329<br>---<br>M src/osmo-bts-lc15/l1_if.c<br>M src/osmo-bts-oc2g/l1_if.c<br>M src/osmo-bts-octphy/l1_if.c<br>3 files changed, 16 insertions(+), 3 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/osmo-bts-lc15/l1_if.c b/src/osmo-bts-lc15/l1_if.c</span><br><span>index 02c8646..ac165b8 100644</span><br><span>--- a/src/osmo-bts-lc15/l1_if.c</span><br><span>+++ b/src/osmo-bts-lc15/l1_if.c</span><br><span>@@ -553,7 +553,12 @@</span><br><span>              empty_req_from_l1sap(l1p, fl1, u8Tn, u32Fn, sapi, subCh, u8BlockNbr);</span><br><span>        }</span><br><span>    /* send message to DSP's queue */</span><br><span style="color: hsl(0, 100%, 40%);">-   osmo_wqueue_enqueue(&fl1->write_q[MQ_L1_WRITE], nmsg);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (osmo_wqueue_enqueue(&fl1->write_q[MQ_L1_WRITE], nmsg) < 0) {</span><br><span style="color: hsl(120, 100%, 40%);">+            LOGPFN(DL1P, LOGL_ERROR, u32Fn, "MQ_L1_WRITE queue full. Dropping msg.\n");</span><br><span style="color: hsl(120, 100%, 40%);">+         msgb_free(nmsg);</span><br><span style="color: hsl(120, 100%, 40%);">+              return -ENOBUFS;</span><br><span style="color: hsl(120, 100%, 40%);">+      }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span>  if (dtx_is_first_p1(lchan))</span><br><span>          dtx_dispatch(lchan, E_FIRST);</span><br><span>        else</span><br><span>diff --git a/src/osmo-bts-oc2g/l1_if.c b/src/osmo-bts-oc2g/l1_if.c</span><br><span>index 2cefc3b..194f82a 100644</span><br><span>--- a/src/osmo-bts-oc2g/l1_if.c</span><br><span>+++ b/src/osmo-bts-oc2g/l1_if.c</span><br><span>@@ -606,7 +606,11 @@</span><br><span>                 empty_req_from_l1sap(l1p, fl1, u8Tn, u32Fn, sapi, subCh, u8BlockNbr);</span><br><span>        }</span><br><span>    /* send message to DSP's queue */</span><br><span style="color: hsl(0, 100%, 40%);">-   osmo_wqueue_enqueue(&fl1->write_q[MQ_L1_WRITE], nmsg);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (osmo_wqueue_enqueue(&fl1->write_q[MQ_L1_WRITE], nmsg) < 0) {</span><br><span style="color: hsl(120, 100%, 40%);">+            LOGPFN(DL1P, LOGL_ERROR, u32Fn, "MQ_L1_WRITE queue full. Dropping msg.\n");</span><br><span style="color: hsl(120, 100%, 40%);">+         msgb_free(nmsg);</span><br><span style="color: hsl(120, 100%, 40%);">+              return -ENOBUFS;</span><br><span style="color: hsl(120, 100%, 40%);">+      }</span><br><span>    if (dtx_is_first_p1(lchan))</span><br><span>          dtx_dispatch(lchan, E_FIRST);</span><br><span>        else</span><br><span>diff --git a/src/osmo-bts-octphy/l1_if.c b/src/osmo-bts-octphy/l1_if.c</span><br><span>index 294a65e..ebd960e 100644</span><br><span>--- a/src/osmo-bts-octphy/l1_if.c</span><br><span>+++ b/src/osmo-bts-octphy/l1_if.c</span><br><span>@@ -1302,7 +1302,11 @@</span><br><span>                       wlc->num_retrans++;</span><br><span>                       msg = msgb_copy(wlc->cmd_msg, "PHY CMD Retrans");</span><br><span>                       msg_set_retrans_flag(msg);</span><br><span style="color: hsl(0, 100%, 40%);">-                      osmo_wqueue_enqueue(&fl1h->phy_wq, msg);</span><br><span style="color: hsl(120, 100%, 40%);">+                       if (osmo_wqueue_enqueue(&fl1h->phy_wq, msg) < 0) {</span><br><span style="color: hsl(120, 100%, 40%);">+                          LOGP(DL1C, LOGL_ERROR, "Queue full on wlc retransmit\n");</span><br><span style="color: hsl(120, 100%, 40%);">+                           msgb_free(msg);</span><br><span style="color: hsl(120, 100%, 40%);">+                               return 0;</span><br><span style="color: hsl(120, 100%, 40%);">+                     }</span><br><span>                    osmo_timer_schedule(&wlc->timer, CMD_TIMEOUT, 0);</span><br><span>                     count++;</span><br><span>                     LOGP(DL1C, LOGL_INFO, "Re-transmitting %s "</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-bts/+/26362">change 26362</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-bts/+/26362"/><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-Change-Id: Ic67fbef23e419c0c8a7bcfb16d134e1bf649de72 </div>
<div style="display:none"> Gerrit-Change-Number: 26362 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </div>
<div style="display:none"> Gerrit-Owner: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: daniel <dwillmann@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>