<p>Stefan Sperling has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/10648">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Properly deal with sockaddr_un socket path length limitations.<br><br>In osmo_sock_unix_init(), add support for non-NUL-terminated unix<br>socket paths and return an error if the supplied socket path exceeds<br>the maximum socket path length supported by the operating system.<br><br>Change-Id: I19d935e5e3dd7928e6e153c6f5ad7044de726016<br>Related: OS#2673<br>---<br>M src/socket.c<br>1 file changed, 11 insertions(+), 4 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/48/10648/1</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 7e7f6d9..6f56efb 100644</span><br><span>--- a/src/socket.c</span><br><span>+++ b/src/socket.c</span><br><span>@@ -605,22 +605,29 @@</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(120, 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%);">-     osmo_strlcpy(local.sun_path, socket_path, sizeof(local.sun_path));</span><br><span style="color: hsl(120, 100%, 40%);">+    if (socket_path_len == sizeof(local.sun_path)) {</span><br><span style="color: hsl(120, 100%, 40%);">+              /* Handle corner-case where sun_path is not NUL-terminated. See the unix(7) man page. */</span><br><span style="color: hsl(120, 100%, 40%);">+              memcpy(local.sun_path, socket_path, sizeof(local.sun_path));</span><br><span style="color: hsl(120, 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%);">+          LOGP(DLGLOBAL, LOGL_ERROR, "Socket path exceeds maximum length of %zd bytes: %s\n",</span><br><span style="color: hsl(120, 100%, 40%);">+              sizeof(local.sun_path), socket_path);</span><br><span style="color: hsl(120, 100%, 40%);">+            return -ENOSPC;</span><br><span style="color: hsl(120, 100%, 40%);">+       }</span><br><span> </span><br><span> #if defined(BSD44SOCKETS) || defined(__UNIXWARE__)</span><br><span style="color: hsl(0, 100%, 40%);">-     local.sun_len = strlen(local.sun_path);</span><br><span style="color: hsl(120, 100%, 40%);">+       local.sun_len = socket_path_len;</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 = strlen(local.sun_path) +</span><br><span style="color: hsl(0, 100%, 40%);">-                offsetof(struct sockaddr_un, sun_path);</span><br><span style="color: hsl(120, 100%, 40%);">+     namelen = socket_path_len + 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/10648">change 10648</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/10648"/><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: newchange </div>
<div style="display:none"> Gerrit-Change-Id: I19d935e5e3dd7928e6e153c6f5ad7044de726016 </div>
<div style="display:none"> Gerrit-Change-Number: 10648 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Stefan Sperling <ssperling@sysmocom.de> </div>