<p>Pau Espin Pedrol has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/9263">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">ipaccess: Avoid using released line and bfd in ipaccess_fd_cb<br><br>Related: OS#3282<br><br>Change-Id: I52faa9e6717137a7dab9c4e006eaa50b7367fc3e<br>---<br>M src/input/ipaccess.c<br>1 file changed, 12 insertions(+), 18 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/libosmo-abis refs/changes/63/9263/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/input/ipaccess.c b/src/input/ipaccess.c</span><br><span>index bbdc5af..e46b0ab 100644</span><br><span>--- a/src/input/ipaccess.c</span><br><span>+++ b/src/input/ipaccess.c</span><br><span>@@ -84,6 +84,8 @@</span><br><span> return ret;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+/* Returns -1 on error, and 0 or 1 on success. If -1 or 1 is returned, line has</span><br><span style="color: hsl(120, 100%, 40%);">+ * been release and should not be used anymore by the caller. */</span><br><span> static int ipaccess_rcvmsg(struct e1inp_line *line, struct msgb *msg,</span><br><span> struct osmo_fd *bfd)</span><br><span> {</span><br><span>@@ -123,13 +125,11 @@</span><br><span> if (ret < 0) {</span><br><span> LOGP(DLINP, LOGL_ERROR, "IPA response message "</span><br><span> "with malformed TLVs\n");</span><br><span style="color: hsl(0, 100%, 40%);">- ret = -EINVAL;</span><br><span> goto err;</span><br><span> }</span><br><span> if (!TLVP_PRESENT(&tlvp, IPAC_IDTAG_UNIT)) {</span><br><span> LOGP(DLINP, LOGL_ERROR, "IPA response message "</span><br><span> "without unit ID\n");</span><br><span style="color: hsl(0, 100%, 40%);">- ret = -EINVAL;</span><br><span> goto err;</span><br><span> </span><br><span> }</span><br><span>@@ -137,7 +137,6 @@</span><br><span> if (len < 1) {</span><br><span> LOGP(DLINP, LOGL_ERROR, "IPA response message "</span><br><span> "with too small unit ID\n");</span><br><span style="color: hsl(0, 100%, 40%);">- ret = -EINVAL;</span><br><span> goto err;</span><br><span> }</span><br><span> unitid = (char *) TLVP_VAL(&tlvp, IPAC_IDTAG_UNIT);</span><br><span>@@ -147,7 +146,6 @@</span><br><span> if (!line->ops->sign_link_up) {</span><br><span> LOGP(DLINP, LOGL_ERROR,</span><br><span> "Unable to set signal link, closing socket.\n");</span><br><span style="color: hsl(0, 100%, 40%);">- ret = -EINVAL;</span><br><span> goto err;</span><br><span> }</span><br><span> /* the BSC creates the new sign links at this stage. */</span><br><span>@@ -159,7 +157,6 @@</span><br><span> LOGP(DLINP, LOGL_ERROR,</span><br><span> "Unable to set signal link, "</span><br><span> "closing socket.\n");</span><br><span style="color: hsl(0, 100%, 40%);">- ret = -EINVAL;</span><br><span> goto err;</span><br><span> }</span><br><span> } else if (bfd->priv_nr == E1INP_SIGN_RSL) {</span><br><span>@@ -174,7 +171,6 @@</span><br><span> LOGP(DLINP, LOGL_ERROR,</span><br><span> "Unable to set signal link, "</span><br><span> "closing socket.\n");</span><br><span style="color: hsl(0, 100%, 40%);">- ret = -EINVAL;</span><br><span> goto err;</span><br><span> }</span><br><span> /* this is a bugtrap, the BSC should be using the</span><br><span>@@ -184,7 +180,7 @@</span><br><span> "Fix your BSC, you should use the "</span><br><span> "E1 line used by the OML link for "</span><br><span> "your RSL link.\n");</span><br><span style="color: hsl(0, 100%, 40%);">- return 0;</span><br><span style="color: hsl(120, 100%, 40%);">+ goto err;</span><br><span> }</span><br><span> /* Finally, we know which OML link is associated with</span><br><span> * this RSL link, attach it to this socket. */</span><br><span>@@ -210,11 +206,11 @@</span><br><span> }</span><br><span> /* now we can release the dummy RSL line. */</span><br><span> e1inp_line_put(line);</span><br><span style="color: hsl(120, 100%, 40%);">+ return 1;</span><br><span> }</span><br><span> break;</span><br><span> default:</span><br><span> LOGP(DLINP, LOGL_ERROR, "Unknown IPA message type\n");</span><br><span style="color: hsl(0, 100%, 40%);">- ret = -EINVAL;</span><br><span> goto err;</span><br><span> }</span><br><span> return 0;</span><br><span>@@ -223,9 +219,10 @@</span><br><span> close(bfd->fd);</span><br><span> bfd->fd = -1;</span><br><span> e1inp_line_put(line);</span><br><span style="color: hsl(0, 100%, 40%);">- return ret;</span><br><span style="color: hsl(120, 100%, 40%);">+ return -1;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+/* Returns -EBADF if bfd cannot be used by the caller anymore after return. */</span><br><span> static int handle_ts1_read(struct osmo_fd *bfd)</span><br><span> {</span><br><span> struct e1inp_line *line = bfd->data;</span><br><span>@@ -251,23 +248,21 @@</span><br><span> </span><br><span> hh = (struct ipaccess_head *) msg->data;</span><br><span> if (hh->proto == IPAC_PROTO_IPACCESS) {</span><br><span style="color: hsl(0, 100%, 40%);">- ipaccess_rcvmsg(line, msg, bfd);</span><br><span style="color: hsl(120, 100%, 40%);">+ ret = ipaccess_rcvmsg(line, msg, bfd);</span><br><span style="color: hsl(120, 100%, 40%);">+ /* BIG FAT WARNING: bfd might no longer exist here (ret != 0),</span><br><span style="color: hsl(120, 100%, 40%);">+ * since ipaccess_rcvmsg() might have free'd it !!! */</span><br><span> msgb_free(msg);</span><br><span style="color: hsl(0, 100%, 40%);">- return 0;</span><br><span style="color: hsl(120, 100%, 40%);">+ return ret != 0 ? -EBADF : 0;</span><br><span> } else if (e1i_ts->type == E1INP_TS_TYPE_NONE) {</span><br><span> /* this sign link is not know yet.. complain. */</span><br><span> LOGP(DLINP, LOGL_ERROR, "Timeslot is not configured.\n");</span><br><span style="color: hsl(0, 100%, 40%);">- ret = -EINVAL;</span><br><span> goto err_msg;</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">- /* BIG FAT WARNING: bfd might no longer exist here, since ipaccess_rcvmsg()</span><br><span style="color: hsl(0, 100%, 40%);">- * might have free'd it !!! */</span><br><span> </span><br><span> link = e1inp_lookup_sign_link(e1i_ts, hh->proto, 0);</span><br><span> if (!link) {</span><br><span> LOGP(DLINP, LOGL_ERROR, "no matching signalling link for "</span><br><span> "hh->proto=0x%02x\n", hh->proto);</span><br><span style="color: hsl(0, 100%, 40%);">- ret = -EINVAL;</span><br><span> goto err_msg;</span><br><span> }</span><br><span> msg->dst = link;</span><br><span>@@ -276,7 +271,6 @@</span><br><span> if (!e1i_ts->line->ops->sign_link) {</span><br><span> LOGP(DLINP, LOGL_ERROR, "Fix your application, "</span><br><span> "no action set for signalling messages.\n");</span><br><span style="color: hsl(0, 100%, 40%);">- ret = -EINVAL;</span><br><span> goto err_msg;</span><br><span> }</span><br><span> rc = e1i_ts->line->ops->sign_link(msg);</span><br><span>@@ -294,7 +288,7 @@</span><br><span> msgb_free(msg);</span><br><span> err:</span><br><span> ipaccess_drop(bfd, line);</span><br><span style="color: hsl(0, 100%, 40%);">- return ret;</span><br><span style="color: hsl(120, 100%, 40%);">+ return -EBADF;</span><br><span> }</span><br><span> </span><br><span> static int ts_want_write(struct e1inp_ts *e1i_ts)</span><br><span>@@ -395,7 +389,7 @@</span><br><span> </span><br><span> if (what & BSC_FD_READ)</span><br><span> rc = handle_ts1_read(bfd);</span><br><span style="color: hsl(0, 100%, 40%);">- if (what & BSC_FD_WRITE)</span><br><span style="color: hsl(120, 100%, 40%);">+ if (rc!=-EBADF && (what & BSC_FD_WRITE))</span><br><span> rc = handle_ts1_write(bfd);</span><br><span> </span><br><span> return rc;</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/9263">change 9263</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/9263"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: libosmo-abis </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>
<div style="display:none"> Gerrit-Change-Id: I52faa9e6717137a7dab9c4e006eaa50b7367fc3e </div>
<div style="display:none"> Gerrit-Change-Number: 9263 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Pau Espin Pedrol <pespin@sysmocom.de> </div>