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

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">osmobts_sock.cpp: pcu_sock_read(): use stack buffer, not heap<br><br>We don't really need to use the message buffer (on heap), because<br>it's never getting passed to pcu_rx(). Let's use a buffer on stack.<br><br>Change-Id: I4cb8ca80513df7b71e1438da2e82799be6be1fa0<br>---<br>M src/osmobts_sock.cpp<br>1 file changed, 3 insertions(+), 15 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/osmobts_sock.cpp b/src/osmobts_sock.cpp</span><br><span>index 9fcd99d..a3e9d63 100644</span><br><span>--- a/src/osmobts_sock.cpp</span><br><span>+++ b/src/osmobts_sock.cpp</span><br><span>@@ -139,17 +139,10 @@</span><br><span> static int pcu_sock_read(struct osmo_fd *bfd)</span><br><span> {</span><br><span>       struct pcu_sock_state *state = (struct pcu_sock_state *)bfd->data;</span><br><span style="color: hsl(0, 100%, 40%);">-   struct gsm_pcu_if *pcu_prim;</span><br><span style="color: hsl(0, 100%, 40%);">-    struct msgb *msg;</span><br><span style="color: hsl(120, 100%, 40%);">+     struct gsm_pcu_if pcu_prim;</span><br><span>  int rc;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-     msg = msgb_alloc(sizeof(*pcu_prim), "pcu_sock_rx");</span><br><span style="color: hsl(0, 100%, 40%);">-   if (!msg)</span><br><span style="color: hsl(0, 100%, 40%);">-               return -ENOMEM;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- pcu_prim = (struct gsm_pcu_if *) msg->tail;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-  rc = recv(bfd->fd, msg->tail, msgb_tailroom(msg), 0);</span><br><span style="color: hsl(120, 100%, 40%);">+   rc = recv(bfd->fd, &pcu_prim, sizeof(pcu_prim), 0);</span><br><span>   if (rc == 0)</span><br><span>                 goto close;</span><br><span> </span><br><span>@@ -159,16 +152,11 @@</span><br><span>              goto close;</span><br><span>  }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-   rc = pcu_rx(pcu_prim->msg_type, pcu_prim);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-   /* as we always synchronously process the message in pcu_rx() and</span><br><span style="color: hsl(0, 100%, 40%);">-        * its callbacks, we can free the message here. */</span><br><span style="color: hsl(0, 100%, 40%);">-      msgb_free(msg);</span><br><span style="color: hsl(120, 100%, 40%);">+       rc = pcu_rx(pcu_prim.msg_type, &pcu_prim);</span><br><span> </span><br><span>   return rc;</span><br><span> </span><br><span> close:</span><br><span style="color: hsl(0, 100%, 40%);">-        msgb_free(msg);</span><br><span>      pcu_sock_close(state, 1);</span><br><span>    return -1;</span><br><span> }</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-pcu/+/15279">change 15279</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/+/15279"/><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: I4cb8ca80513df7b71e1438da2e82799be6be1fa0 </div>
<div style="display:none"> Gerrit-Change-Number: 15279 </div>
<div style="display:none"> Gerrit-PatchSet: 3 </div>
<div style="display:none"> Gerrit-Owner: fixeria <axilirator@gmail.com> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: fixeria <axilirator@gmail.com> </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>