<p>Harald Welte <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/11045">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
Harald Welte: Looks good to me, approved
</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 b24efa5 erroneously assumed otherwise.<br><br>Change-Id: I9beecfa500db75cb679b1edcc352c893bf098b13<br>Fixes: b24efa551dc91e177c5cb8da674e9f8432d52dc9<br>Related: OS#2673<br>---<br>M src/e1_input_vty.c<br>M src/input/unixsocket.c<br>2 files changed, 15 insertions(+), 7 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/e1_input_vty.c b/src/e1_input_vty.c</span><br><span>index 653c573..d81c859 100644</span><br><span>--- a/src/e1_input_vty.c</span><br><span>+++ b/src/e1_input_vty.c</span><br><span>@@ -101,10 +101,10 @@</span><br><span> int e1_nr = atoi(argv[0]);</span><br><span> struct sockaddr_un sun;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- /* Don't exceed the maximum unix socket path length. See the unix(7) man page.*/</span><br><span style="color: hsl(0, 100%, 40%);">- if (strlen(argv[1]) > sizeof(sun.sun_path)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Don't exceed the maximum unix socket path length, including a NUL byte. See the unix(7) man page.*/</span><br><span style="color: hsl(120, 100%, 40%);">+ if (strlen(argv[1]) > sizeof(sun.sun_path) - 1) {</span><br><span> vty_out(vty, "%% Socket path length exceeds %zd bytes: '%s'%s",</span><br><span style="color: hsl(0, 100%, 40%);">- sizeof(sun.sun_path), argv[1], VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+ sizeof(sun.sun_path) - 1, argv[1], VTY_NEWLINE);</span><br><span> return CMD_WARNING;</span><br><span> }</span><br><span> </span><br><span>diff --git a/src/input/unixsocket.c b/src/input/unixsocket.c</span><br><span>index 00e1f9b..bc4b357 100644</span><br><span>--- a/src/input/unixsocket.c</span><br><span>+++ b/src/input/unixsocket.c</span><br><span>@@ -229,7 +229,7 @@</span><br><span> static int unixsocket_line_update(struct e1inp_line *line)</span><br><span> {</span><br><span> struct unixsocket_line *config;</span><br><span style="color: hsl(0, 100%, 40%);">- char default_sock_path[sizeof(struct sockaddr_un) + 1]; /* see unix(7) man page */</span><br><span style="color: hsl(120, 100%, 40%);">+ struct sockaddr_un un;</span><br><span> const char *sock_path;</span><br><span> int ret = 0;</span><br><span> int i;</span><br><span>@@ -252,9 +252,17 @@</span><br><span> </span><br><span> /* Open unix domain socket */</span><br><span> if (line->sock_path == NULL) {</span><br><span style="color: hsl(0, 100%, 40%);">- snprintf(default_sock_path, sizeof(default_sock_path), "%s%d",</span><br><span style="color: hsl(0, 100%, 40%);">- UNIXSOCKET_SOCK_PATH_DEFAULT, line->num);</span><br><span style="color: hsl(0, 100%, 40%);">- sock_path = default_sock_path;</span><br><span style="color: hsl(120, 100%, 40%);">+ ret = snprintf(un.sun_path, sizeof(un.sun_path), "%s%d",</span><br><span style="color: hsl(120, 100%, 40%);">+ UNIXSOCKET_SOCK_PATH_DEFAULT, line->num);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (ret == -1) {</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DLINP, LOGL_ERROR, "Cannot create default socket path: %s\n", strerror(errno));</span><br><span style="color: hsl(120, 100%, 40%);">+ return -errno;</span><br><span style="color: hsl(120, 100%, 40%);">+ } else if (ret >= sizeof(un.sun_path)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DLINP, LOGL_ERROR, "Default socket path exceeds %zd bytes: %s%d\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ sizeof(un.sun_path), UNIXSOCKET_SOCK_PATH_DEFAULT, line->num);</span><br><span style="color: hsl(120, 100%, 40%);">+ return -ENOSPC;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ sock_path = un.sun_path;</span><br><span> } else</span><br><span> sock_path = line->sock_path;</span><br><span> ret = osmo_sock_unix_init(SOCK_SEQPACKET, 0, sock_path,</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/11045">change 11045</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/11045"/><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: merged </div>
<div style="display:none"> Gerrit-Change-Id: I9beecfa500db75cb679b1edcc352c893bf098b13 </div>
<div style="display:none"> Gerrit-Change-Number: 11045 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </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>