<p>laforge has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-e1d/+/19218">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Detect truncated reads on SOCK_SEQPACKET sockets<br><br>Related: OS#4663<br>Change-Id: Ie143d3d56a68fda97cb9f5107a27f9beb043a2a4<br>---<br>M src/intf_line.c<br>1 file changed, 16 insertions(+), 2 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-e1d refs/changes/18/19218/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/intf_line.c b/src/intf_line.c</span><br><span>index ce30b4f..fe9edbb 100644</span><br><span>--- a/src/intf_line.c</span><br><span>+++ b/src/intf_line.c</span><br><span>@@ -26,6 +26,9 @@</span><br><span> #include <unistd.h></span><br><span> #include <stdint.h></span><br><span> #include <string.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <sys/types.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <sys/socket.h></span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> #include <talloc.h></span><br><span> </span><br><span> #include <osmocom/core/isdnhdlc.h></span><br><span>@@ -179,8 +182,14 @@</span><br><span>       while (oo < len) {</span><br><span>                /* Pending message ? */</span><br><span>              if (!ts->tx_len) {</span><br><span style="color: hsl(0, 100%, 40%);">-                   rv = read(ts->fd, ts->tx_buf, sizeof(ts->tx_buf));</span><br><span style="color: hsl(120, 100%, 40%);">+                   rv = recv(ts->fd, ts->tx_buf, sizeof(ts->tx_buf), MSG_TRUNC);</span><br><span>                       if (rv > 0) {</span><br><span style="color: hsl(120, 100%, 40%);">+                              if (rv > sizeof(ts->tx_buf)) {</span><br><span style="color: hsl(120, 100%, 40%);">+                                  LOGPTS(ts, DXFR, LOGL_ERROR, "Truncated message: Client tried to "</span><br><span style="color: hsl(120, 100%, 40%);">+                                          "send %d bytes but our buffer is limited to %lu\n",</span><br><span style="color: hsl(120, 100%, 40%);">+                                         rv, sizeof(ts->tx_buf));</span><br><span style="color: hsl(120, 100%, 40%);">+                                   rv = sizeof(ts->tx_buf);</span><br><span style="color: hsl(120, 100%, 40%);">+                           }</span><br><span>                            LOGPTS(ts, DXFR, LOGL_DEBUG, "TX Message: %d [ %s]\n",</span><br><span>                                     rv, osmo_hexdump(ts->tx_buf, rv));</span><br><span>                                ts->tx_len = rv; </span><br><span>@@ -242,7 +251,12 @@</span><br><span> </span><br><span>              switch (ts->mode) {</span><br><span>               case E1_TS_MODE_RAW:</span><br><span style="color: hsl(0, 100%, 40%);">-                    l = read(ts->fd, buf_ts, fts);</span><br><span style="color: hsl(120, 100%, 40%);">+                     l = recv(ts->fd, buf_ts, fts, MSG_TRUNC);</span><br><span style="color: hsl(120, 100%, 40%);">+                  if (l > fts) {</span><br><span style="color: hsl(120, 100%, 40%);">+                             LOGPTS(ts, DXFR, LOGL_ERROR, "Truncated message: Client tried to "</span><br><span style="color: hsl(120, 100%, 40%);">+                                  "send %d bytes but our buffer is limited to %d\n", l, fts);</span><br><span style="color: hsl(120, 100%, 40%);">+                         l = fts;</span><br><span style="color: hsl(120, 100%, 40%);">+                      }</span><br><span>                    break;</span><br><span>               case E1_TS_MODE_HDLCFCS:</span><br><span>                     l = _e1_tx_hdlcfs(ts, buf_ts, fts);</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-e1d/+/19218">change 19218</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-e1d/+/19218"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: osmo-e1d </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: Ie143d3d56a68fda97cb9f5107a27f9beb043a2a4 </div>
<div style="display:none"> Gerrit-Change-Number: 19218 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>