<p>Harald Welte <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/11044">View Change</a></p><div style="white-space:pre-wrap">Approvals:
  Harald Welte: Looks good to me, approved
  Jenkins Builder: Verified

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">ensure unix socket paths are NUL-terminated for bind/connect<br><br>The unix(7) man page recommends that sun_path is NUL-terminated<br>when struct sockaddr_un is passed to a bind() or connect() call.<br>Non-NUL-terminated paths only need to be dealt with at the<br>receiving end of a UNIX domain socket.<br><br>Commit 896ff6d erroneously assumed otherwise.<br>This commit almost reverts 896ff6d: It only leaves the added<br>osmo_strlcpy() overflow check in place.<br><br>Change-Id: I6c4ac6b0a0eef4842beae4107f6f09f6cd29172a<br>Fixes: 896ff6db161465d506bb9bb5bee2cdeef220dd2e<br>Related: OS#2673<br>---<br>M src/socket.c<br>1 file changed, 5 insertions(+), 7 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/socket.c b/src/socket.c</span><br><span>index 6f56efb..a85edb7 100644</span><br><span>--- a/src/socket.c</span><br><span>+++ b/src/socket.c</span><br><span>@@ -605,29 +605,27 @@</span><br><span>         struct sockaddr_un local;</span><br><span>    int sfd, rc, on = 1;</span><br><span>         unsigned int namelen;</span><br><span style="color: hsl(0, 100%, 40%);">-   const size_t socket_path_len = strlen(socket_path);</span><br><span> </span><br><span>      if ((flags & (OSMO_SOCK_F_BIND | OSMO_SOCK_F_CONNECT)) ==</span><br><span>                     (OSMO_SOCK_F_BIND | OSMO_SOCK_F_CONNECT))</span><br><span>               return -EINVAL;</span><br><span> </span><br><span>  local.sun_family = AF_UNIX;</span><br><span style="color: hsl(0, 100%, 40%);">-     if (socket_path_len == sizeof(local.sun_path)) {</span><br><span style="color: hsl(0, 100%, 40%);">-                /* Handle corner-case where sun_path is not NUL-terminated. See the unix(7) man page. */</span><br><span style="color: hsl(0, 100%, 40%);">-                memcpy(local.sun_path, socket_path, sizeof(local.sun_path));</span><br><span style="color: hsl(0, 100%, 40%);">-    } else if (osmo_strlcpy(local.sun_path, socket_path, sizeof(local.sun_path)) >= sizeof(local.sun_path)) {</span><br><span style="color: hsl(120, 100%, 40%);">+  /* When an AF_UNIX socket is bound, sun_path should be NUL-terminated. See unix(7) man page. */</span><br><span style="color: hsl(120, 100%, 40%);">+       if (osmo_strlcpy(local.sun_path, socket_path, sizeof(local.sun_path)) >= sizeof(local.sun_path)) {</span><br><span>                LOGP(DLGLOBAL, LOGL_ERROR, "Socket path exceeds maximum length of %zd bytes: %s\n",</span><br><span>                     sizeof(local.sun_path), socket_path);</span><br><span>           return -ENOSPC;</span><br><span>      }</span><br><span> </span><br><span> #if defined(BSD44SOCKETS) || defined(__UNIXWARE__)</span><br><span style="color: hsl(0, 100%, 40%);">-     local.sun_len = socket_path_len;</span><br><span style="color: hsl(120, 100%, 40%);">+      local.sun_len = strlen(local.sun_path);</span><br><span> #endif</span><br><span> #if defined(BSD44SOCKETS) || defined(SUN_LEN)</span><br><span>   namelen = SUN_LEN(&local);</span><br><span> #else</span><br><span style="color: hsl(0, 100%, 40%);">- namelen = socket_path_len + offsetof(struct sockaddr_un, sun_path);</span><br><span style="color: hsl(120, 100%, 40%);">+   namelen = strlen(local.sun_path) +</span><br><span style="color: hsl(120, 100%, 40%);">+              offsetof(struct sockaddr_un, sun_path);</span><br><span> #endif</span><br><span> </span><br><span>      sfd = socket(AF_UNIX, type, proto);</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/11044">change 11044</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/11044"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: libosmocore </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: I6c4ac6b0a0eef4842beae4107f6f09f6cd29172a </div>
<div style="display:none"> Gerrit-Change-Number: 11044 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </div>
<div style="display:none"> Gerrit-Owner: Stefan Sperling <ssperling@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Harald Welte <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder (1000002) </div>