upstream commit

The POSIX APIs that that sockaddrs all ignore the s*_len
field in the incoming socket, so userspace doesn't need to set it unless it
has its own reasons for tracking the size along with the sockaddr.

ok phessler@ deraadt@ florian@

Upstream-ID: ca6e49e2f22f2b9e81d6d924b90ecd7e422e7437

1 files changed, 2 insertions, 5 deletions

diff --git a/mux.c b/mux.c
index 265c5f12b..2d6639c5c 100644
--- a/mux.c
+++ b/mux.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: mux.c,v 1.63 2016/10/19 23:21:56 dtucker Exp $ */
+/* $OpenBSD: mux.c,v 1.64 2017/01/21 11:32:04 guenther Exp $ */
 /*
  * Copyright (c) 2002-2008 Damien Miller <djm@openbsd.org>
  *
@@ -2161,7 +2161,6 @@ int
 muxclient(const char *path)
 {
         struct sockaddr_un addr;
-        socklen_t sun_len;
         int sock;
         u_int pid;
 
@@ -2185,8 +2184,6 @@ muxclient(const char *path)
 
         memset(&addr, '\0', sizeof(addr));
         addr.sun_family = AF_UNIX;
-        sun_len = offsetof(struct sockaddr_un, sun_path) +
-            strlen(path) + 1;
 
         if (strlcpy(addr.sun_path, path,
             sizeof(addr.sun_path)) >= sizeof(addr.sun_path))
@@ -2196,7 +2193,7 @@ muxclient(const char *path)
         if ((sock = socket(PF_UNIX, SOCK_STREAM, 0)) < 0)
                 fatal("%s socket(): %s", __func__, strerror(errno));
 
-        if (connect(sock, (struct sockaddr *)&addr, sun_len) == -1) {
+        if (connect(sock, (struct sockaddr *)&addr, sizeof(addr)) == -1) {
                 switch (muxclient_command) {
                 case SSHMUX_COMMAND_OPEN:
                 case SSHMUX_COMMAND_STDIO_FWD: