<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-pcu/+/17093">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
laforge: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">pcu_sock: fix memleak, allocate pcu_sock_state on stack<br><br>It was noticed that OsmoPCU leaks memory when trying to reconnect<br>to the BTS. It could be easily fixed, but we don't really need to<br>allocate the PCU socket state on heap as we never have more than<br>one connection.<br><br>Change-Id: Iea8930f443caa16f522f7c5375e0004e4e2315cb<br>---<br>M src/osmobts_sock.cpp<br>1 file changed, 26 insertions(+), 52 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 20fb174..2b2f4de 100644</span><br><span>--- a/src/osmobts_sock.cpp</span><br><span>+++ b/src/osmobts_sock.cpp</span><br><span>@@ -26,7 +26,6 @@</span><br><span> #include <sys/socket.h></span><br><span> #include <sys/un.h></span><br><span> extern "C" {</span><br><span style="color: hsl(0, 100%, 40%);">-#include <osmocom/core/talloc.h></span><br><span> #include <osmocom/core/select.h></span><br><span> #include <osmocom/core/msgb.h></span><br><span> #include <osmocom/core/linuxlist.h></span><br><span>@@ -42,8 +41,6 @@</span><br><span> #include <tbf.h></span><br><span> #include <pdch.h></span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-extern void *tall_pcu_ctx;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> extern "C" {</span><br><span> int l1if_close_pdch(void *obj);</span><br><span> }</span><br><span>@@ -52,11 +49,11 @@</span><br><span> * osmo-bts PCU socket functions</span><br><span> */</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-struct pcu_sock_state {</span><br><span style="color: hsl(120, 100%, 40%);">+static struct {</span><br><span> struct osmo_fd conn_bfd; /* fd for connection to lcr */</span><br><span> struct osmo_timer_list timer; /* socket connect retry timer */</span><br><span> struct llist_head upqueue; /* queue for sending messages */</span><br><span style="color: hsl(0, 100%, 40%);">-} *pcu_sock_state = NULL;</span><br><span style="color: hsl(120, 100%, 40%);">+} pcu_sock_state;</span><br><span> </span><br><span> static void pcu_sock_timeout(void *_priv)</span><br><span> {</span><br><span>@@ -66,40 +63,33 @@</span><br><span> static void pcu_tx_txt_retry(void *_priv)</span><br><span> {</span><br><span> struct gprs_rlcmac_bts *bts = bts_main_data();</span><br><span style="color: hsl(0, 100%, 40%);">- struct pcu_sock_state *state = pcu_sock_state;</span><br><span> </span><br><span> if (bts->active)</span><br><span> return;</span><br><span> </span><br><span> pcu_tx_txt_ind(PCU_VERSION, "%s", PACKAGE_VERSION);</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_timer_schedule(&state->timer, 5, 0);</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_timer_schedule(&pcu_sock_state.timer, 5, 0);</span><br><span> }</span><br><span> </span><br><span> int pcu_sock_send(struct msgb *msg)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- struct pcu_sock_state *state = pcu_sock_state;</span><br><span> struct osmo_fd *conn_bfd;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (!state) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DL1IF, LOGL_NOTICE, "PCU socket not created, dropping "</span><br><span style="color: hsl(0, 100%, 40%);">- "message\n");</span><br><span style="color: hsl(0, 100%, 40%);">- return -EINVAL;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">- conn_bfd = &state->conn_bfd;</span><br><span style="color: hsl(120, 100%, 40%);">+ conn_bfd = &pcu_sock_state.conn_bfd;</span><br><span> if (conn_bfd->fd <= 0) {</span><br><span> LOGP(DL1IF, LOGL_NOTICE, "PCU socket not connected, dropping "</span><br><span> "message\n");</span><br><span> return -EIO;</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">- msgb_enqueue(&state->upqueue, msg);</span><br><span style="color: hsl(120, 100%, 40%);">+ msgb_enqueue(&pcu_sock_state.upqueue, msg);</span><br><span> conn_bfd->when |= BSC_FD_WRITE;</span><br><span> </span><br><span> return 0;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static void pcu_sock_close(struct pcu_sock_state *state, int lost)</span><br><span style="color: hsl(120, 100%, 40%);">+static void pcu_sock_close(int lost)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- struct osmo_fd *bfd = &state->conn_bfd;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct osmo_fd *bfd = &pcu_sock_state.conn_bfd;</span><br><span> struct gprs_rlcmac_bts *bts = bts_main_data();</span><br><span> uint8_t trx, ts;</span><br><span> </span><br><span>@@ -111,8 +101,8 @@</span><br><span> osmo_fd_unregister(bfd);</span><br><span> </span><br><span> /* flush the queue */</span><br><span style="color: hsl(0, 100%, 40%);">- while (!llist_empty(&state->upqueue)) {</span><br><span style="color: hsl(0, 100%, 40%);">- struct msgb *msg = msgb_dequeue(&state->upqueue);</span><br><span style="color: hsl(120, 100%, 40%);">+ while (!llist_empty(&pcu_sock_state.upqueue)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ struct msgb *msg = msgb_dequeue(&pcu_sock_state.upqueue);</span><br><span> msgb_free(msg);</span><br><span> }</span><br><span> </span><br><span>@@ -137,7 +127,6 @@</span><br><span> </span><br><span> static int pcu_sock_read(struct osmo_fd *bfd)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- struct pcu_sock_state *state = (struct pcu_sock_state *)bfd->data;</span><br><span> struct gsm_pcu_if pcu_prim;</span><br><span> int rc;</span><br><span> </span><br><span>@@ -145,7 +134,7 @@</span><br><span> if (rc < 0 && errno == EAGAIN)</span><br><span> return 0; /* Try again later */</span><br><span> if (rc <= 0) {</span><br><span style="color: hsl(0, 100%, 40%);">- pcu_sock_close(state, 1);</span><br><span style="color: hsl(120, 100%, 40%);">+ pcu_sock_close(1);</span><br><span> return -EIO;</span><br><span> }</span><br><span> </span><br><span>@@ -154,15 +143,14 @@</span><br><span> </span><br><span> static int pcu_sock_write(struct osmo_fd *bfd)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- struct pcu_sock_state *state = (struct pcu_sock_state *)bfd->data;</span><br><span> int rc;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- while (!llist_empty(&state->upqueue)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ while (!llist_empty(&pcu_sock_state.upqueue)) {</span><br><span> struct msgb *msg, *msg2;</span><br><span> struct gsm_pcu_if *pcu_prim;</span><br><span> </span><br><span> /* peek at the beginning of the queue */</span><br><span style="color: hsl(0, 100%, 40%);">- msg = llist_entry(state->upqueue.next, struct msgb, list);</span><br><span style="color: hsl(120, 100%, 40%);">+ msg = llist_entry(pcu_sock_state.upqueue.next, struct msgb, list);</span><br><span> pcu_prim = (struct gsm_pcu_if *)msg->data;</span><br><span> </span><br><span> bfd->when &= ~BSC_FD_WRITE;</span><br><span>@@ -188,14 +176,14 @@</span><br><span> </span><br><span> dontsend:</span><br><span> /* _after_ we send it, we can deueue */</span><br><span style="color: hsl(0, 100%, 40%);">- msg2 = msgb_dequeue(&state->upqueue);</span><br><span style="color: hsl(120, 100%, 40%);">+ msg2 = msgb_dequeue(&pcu_sock_state.upqueue);</span><br><span> assert(msg == msg2);</span><br><span> msgb_free(msg);</span><br><span> }</span><br><span> return 0;</span><br><span> </span><br><span> close:</span><br><span style="color: hsl(0, 100%, 40%);">- pcu_sock_close(state, 1);</span><br><span style="color: hsl(120, 100%, 40%);">+ pcu_sock_close(1);</span><br><span> </span><br><span> return -1;</span><br><span> }</span><br><span>@@ -217,60 +205,46 @@</span><br><span> </span><br><span> int pcu_l1if_open(void)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- struct pcu_sock_state *state;</span><br><span> int rc;</span><br><span> struct gprs_rlcmac_bts *bts = bts_main_data();</span><br><span> </span><br><span> LOGP(DL1IF, LOGL_INFO, "Opening OsmoPCU L1 interface to OsmoBTS\n");</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- state = pcu_sock_state;</span><br><span style="color: hsl(0, 100%, 40%);">- if (!state) {</span><br><span style="color: hsl(0, 100%, 40%);">- state = talloc_zero(tall_pcu_ctx, struct pcu_sock_state);</span><br><span style="color: hsl(0, 100%, 40%);">- if (!state)</span><br><span style="color: hsl(0, 100%, 40%);">- return -ENOMEM;</span><br><span style="color: hsl(0, 100%, 40%);">- INIT_LLIST_HEAD(&state->upqueue);</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(120, 100%, 40%);">+ memset(&pcu_sock_state, 0x00, sizeof(pcu_sock_state));</span><br><span style="color: hsl(120, 100%, 40%);">+ INIT_LLIST_HEAD(&pcu_sock_state.upqueue);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- rc = osmo_sock_unix_init_ofd(&state->conn_bfd, SOCK_SEQPACKET, 0,</span><br><span style="color: hsl(120, 100%, 40%);">+ rc = osmo_sock_unix_init_ofd(&pcu_sock_state.conn_bfd, SOCK_SEQPACKET, 0,</span><br><span> bts->pcu_sock_path, OSMO_SOCK_F_CONNECT);</span><br><span> if (rc < 0) {</span><br><span> LOGP(DL1IF, LOGL_ERROR, "Failed to connect to the BTS (%s). "</span><br><span> "Retrying...\n", bts->pcu_sock_path);</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_timer_setup(&state->timer, pcu_sock_timeout, NULL);</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_timer_schedule(&state->timer, 5, 0);</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_timer_setup(&pcu_sock_state.timer, pcu_sock_timeout, NULL);</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_timer_schedule(&pcu_sock_state.timer, 5, 0);</span><br><span> return 0;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- state->conn_bfd.cb = pcu_sock_cb;</span><br><span style="color: hsl(0, 100%, 40%);">- state->conn_bfd.data = state;</span><br><span style="color: hsl(120, 100%, 40%);">+ pcu_sock_state.conn_bfd.cb = pcu_sock_cb;</span><br><span style="color: hsl(120, 100%, 40%);">+ pcu_sock_state.conn_bfd.data = NULL;</span><br><span> </span><br><span> LOGP(DL1IF, LOGL_NOTICE, "osmo-bts PCU socket %s has been connected\n",</span><br><span> bts->pcu_sock_path);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- pcu_sock_state = state;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> pcu_tx_txt_ind(PCU_VERSION, "%s", PACKAGE_VERSION);</span><br><span> </span><br><span> /* Schedule a timer so we keep trying until the BTS becomes active. */</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_timer_setup(&state->timer, pcu_tx_txt_retry, NULL);</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_timer_schedule(&state->timer, 5, 0);</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_timer_setup(&pcu_sock_state.timer, pcu_tx_txt_retry, NULL);</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_timer_schedule(&pcu_sock_state.timer, 5, 0);</span><br><span> </span><br><span> return 0;</span><br><span> }</span><br><span> </span><br><span> void pcu_l1if_close(void)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- struct pcu_sock_state *state = pcu_sock_state;</span><br><span> struct osmo_fd *bfd;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (!state)</span><br><span style="color: hsl(0, 100%, 40%);">- return;</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_timer_del(&pcu_sock_state.timer);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- osmo_timer_del(&state->timer);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- bfd = &state->conn_bfd;</span><br><span style="color: hsl(120, 100%, 40%);">+ bfd = &pcu_sock_state.conn_bfd;</span><br><span> if (bfd->fd > 0)</span><br><span style="color: hsl(0, 100%, 40%);">- pcu_sock_close(state, 0);</span><br><span style="color: hsl(0, 100%, 40%);">- talloc_free(state);</span><br><span style="color: hsl(0, 100%, 40%);">- pcu_sock_state = NULL;</span><br><span style="color: hsl(120, 100%, 40%);">+ pcu_sock_close(0);</span><br><span> }</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-pcu/+/17093">change 17093</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/+/17093"/><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: Iea8930f443caa16f522f7c5375e0004e4e2315cb </div>
<div style="display:none"> Gerrit-Change-Number: 17093 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </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: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>