Updated through tag hostap_2_5 from git://w1.fi/hostap.git
[mech_eap.git] / libeap / wpa_supplicant / ctrl_iface_unix.c
index 6040828..11f2814 100644 (file)
@@ -1,15 +1,9 @@
 /*
  * WPA Supplicant / UNIX domain socket -based control interface
- * Copyright (c) 2004-2009, Jouni Malinen <j@w1.fi>
+ * Copyright (c) 2004-2014, Jouni Malinen <j@w1.fi>
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- *
- * Alternatively, this software may be distributed under the terms of BSD
- * license.
- *
- * See README and COPYING for more details.
+ * This software may be distributed under the terms of the BSD license.
+ * See README for more details.
  */
 
 #include "includes.h"
 #include <sys/stat.h>
 #include <grp.h>
 #include <stddef.h>
+#include <unistd.h>
+#include <fcntl.h>
+#ifdef __linux__
+#include <sys/ioctl.h>
+#include <linux/sockios.h>
+#endif /* __linux__ */
+#ifdef ANDROID
+#include <cutils/sockets.h>
+#endif /* ANDROID */
 
 #include "utils/common.h"
 #include "utils/eloop.h"
@@ -48,19 +51,63 @@ struct ctrl_iface_priv {
        struct wpa_supplicant *wpa_s;
        int sock;
        struct dl_list ctrl_dst;
+       int android_control_socket;
+};
+
+
+struct ctrl_iface_global_priv {
+       struct wpa_global *global;
+       int sock;
+       struct dl_list ctrl_dst;
+       int android_control_socket;
 };
 
 
-static void wpa_supplicant_ctrl_iface_send(struct ctrl_iface_priv *priv,
+static void wpa_supplicant_ctrl_iface_send(struct wpa_supplicant *wpa_s,
+                                          const char *ifname, int sock,
+                                          struct dl_list *ctrl_dst,
                                           int level, const char *buf,
-                                          size_t len);
+                                          size_t len,
+                                          struct ctrl_iface_priv *priv,
+                                          struct ctrl_iface_global_priv *gp);
+static int wpas_ctrl_iface_reinit(struct wpa_supplicant *wpa_s,
+                                 struct ctrl_iface_priv *priv);
+static int wpas_ctrl_iface_global_reinit(struct wpa_global *global,
+                                        struct ctrl_iface_global_priv *priv);
+
+
+static void wpas_ctrl_sock_debug(const char *title, int sock, const char *buf,
+                                size_t len)
+{
+#ifdef __linux__
+       socklen_t optlen;
+       int sndbuf, outq;
+       int level = MSG_MSGDUMP;
+
+       if (len >= 5 && os_strncmp(buf, "PONG\n", 5) == 0)
+               level = MSG_EXCESSIVE;
+
+       optlen = sizeof(sndbuf);
+       sndbuf = 0;
+       if (getsockopt(sock, SOL_SOCKET, SO_SNDBUF, &sndbuf, &optlen) < 0)
+               sndbuf = -1;
+
+       if (ioctl(sock, SIOCOUTQ, &outq) < 0)
+               outq = -1;
+
+       wpa_printf(level,
+                  "CTRL-DEBUG: %s: sock=%d sndbuf=%d outq=%d send_len=%d",
+                  title, sock, sndbuf, outq, (int) len);
+#endif /* __linux__ */
+}
 
 
-static int wpa_supplicant_ctrl_iface_attach(struct ctrl_iface_priv *priv,
+static int wpa_supplicant_ctrl_iface_attach(struct dl_list *ctrl_dst,
                                            struct sockaddr_un *from,
-                                           socklen_t fromlen)
+                                           socklen_t fromlen, int global)
 {
        struct wpa_ctrl_dst *dst;
+       char addr_txt[200];
 
        dst = os_zalloc(sizeof(*dst));
        if (dst == NULL)
@@ -68,31 +115,36 @@ static int wpa_supplicant_ctrl_iface_attach(struct ctrl_iface_priv *priv,
        os_memcpy(&dst->addr, from, sizeof(struct sockaddr_un));
        dst->addrlen = fromlen;
        dst->debug_level = MSG_INFO;
-       dl_list_add(&priv->ctrl_dst, &dst->list);
-       wpa_hexdump(MSG_DEBUG, "CTRL_IFACE monitor attached",
-                   (u8 *) from->sun_path,
-                   fromlen - offsetof(struct sockaddr_un, sun_path));
+       dl_list_add(ctrl_dst, &dst->list);
+       printf_encode(addr_txt, sizeof(addr_txt),
+                     (u8 *) from->sun_path,
+                     fromlen - offsetof(struct sockaddr_un, sun_path));
+       wpa_printf(MSG_DEBUG, "CTRL_IFACE %smonitor attached %s",
+                  global ? "global " : "", addr_txt);
        return 0;
 }
 
 
-static int wpa_supplicant_ctrl_iface_detach(struct ctrl_iface_priv *priv,
+static int wpa_supplicant_ctrl_iface_detach(struct dl_list *ctrl_dst,
                                            struct sockaddr_un *from,
                                            socklen_t fromlen)
 {
        struct wpa_ctrl_dst *dst;
 
-       dl_list_for_each(dst, &priv->ctrl_dst, struct wpa_ctrl_dst, list) {
+       dl_list_for_each(dst, ctrl_dst, struct wpa_ctrl_dst, list) {
                if (fromlen == dst->addrlen &&
                    os_memcmp(from->sun_path, dst->addr.sun_path,
                              fromlen - offsetof(struct sockaddr_un, sun_path))
                    == 0) {
+                       char addr_txt[200];
+                       printf_encode(addr_txt, sizeof(addr_txt),
+                                     (u8 *) from->sun_path,
+                                     fromlen -
+                                     offsetof(struct sockaddr_un, sun_path));
+                       wpa_printf(MSG_DEBUG, "CTRL_IFACE monitor detached %s",
+                                  addr_txt);
                        dl_list_del(&dst->list);
                        os_free(dst);
-                       wpa_hexdump(MSG_DEBUG, "CTRL_IFACE monitor detached",
-                                   (u8 *) from->sun_path,
-                                   fromlen -
-                                   offsetof(struct sockaddr_un, sun_path));
                        return 0;
                }
        }
@@ -114,11 +166,13 @@ static int wpa_supplicant_ctrl_iface_level(struct ctrl_iface_priv *priv,
                    os_memcmp(from->sun_path, dst->addr.sun_path,
                              fromlen - offsetof(struct sockaddr_un, sun_path))
                    == 0) {
-                       wpa_hexdump(MSG_DEBUG, "CTRL_IFACE changed monitor "
-                                   "level", (u8 *) from->sun_path,
-                                   fromlen -
-                                   offsetof(struct sockaddr_un, sun_path));
+                       char addr_txt[200];
                        dst->debug_level = atoi(level);
+                       printf_encode(addr_txt, sizeof(addr_txt),
+                                     (u8 *) from->sun_path, fromlen -
+                                     offsetof(struct sockaddr_un, sun_path));
+                       wpa_printf(MSG_DEBUG, "CTRL_IFACE changed monitor level to %d for %s",
+                                  dst->debug_level, addr_txt);
                        return 0;
                }
        }
@@ -136,27 +190,30 @@ static void wpa_supplicant_ctrl_iface_receive(int sock, void *eloop_ctx,
        int res;
        struct sockaddr_un from;
        socklen_t fromlen = sizeof(from);
-       char *reply = NULL;
+       char *reply = NULL, *reply_buf = NULL;
        size_t reply_len = 0;
        int new_attached = 0;
 
        res = recvfrom(sock, buf, sizeof(buf) - 1, 0,
                       (struct sockaddr *) &from, &fromlen);
        if (res < 0) {
-               perror("recvfrom(ctrl_iface)");
+               wpa_printf(MSG_ERROR, "recvfrom(ctrl_iface): %s",
+                          strerror(errno));
                return;
        }
        buf[res] = '\0';
 
        if (os_strcmp(buf, "ATTACH") == 0) {
-               if (wpa_supplicant_ctrl_iface_attach(priv, &from, fromlen))
+               if (wpa_supplicant_ctrl_iface_attach(&priv->ctrl_dst, &from,
+                                                    fromlen, 0))
                        reply_len = 1;
                else {
                        new_attached = 1;
                        reply_len = 2;
                }
        } else if (os_strcmp(buf, "DETACH") == 0) {
-               if (wpa_supplicant_ctrl_iface_detach(priv, &from, fromlen))
+               if (wpa_supplicant_ctrl_iface_detach(&priv->ctrl_dst, &from,
+                                                    fromlen))
                        reply_len = 1;
                else
                        reply_len = 2;
@@ -167,21 +224,58 @@ static void wpa_supplicant_ctrl_iface_receive(int sock, void *eloop_ctx,
                else
                        reply_len = 2;
        } else {
-               reply = wpa_supplicant_ctrl_iface_process(wpa_s, buf,
-                                                         &reply_len);
+               reply_buf = wpa_supplicant_ctrl_iface_process(wpa_s, buf,
+                                                             &reply_len);
+               reply = reply_buf;
+
+               /*
+                * There could be some password/key material in the command, so
+                * clear the buffer explicitly now that it is not needed
+                * anymore.
+                */
+               os_memset(buf, 0, res);
+       }
+
+       if (!reply && reply_len == 1) {
+               reply = "FAIL\n";
+               reply_len = 5;
+       } else if (!reply && reply_len == 2) {
+               reply = "OK\n";
+               reply_len = 3;
        }
 
        if (reply) {
-               sendto(sock, reply, reply_len, 0, (struct sockaddr *) &from,
-                      fromlen);
-               os_free(reply);
-       } else if (reply_len == 1) {
-               sendto(sock, "FAIL\n", 5, 0, (struct sockaddr *) &from,
-                      fromlen);
-       } else if (reply_len == 2) {
-               sendto(sock, "OK\n", 3, 0, (struct sockaddr *) &from,
-                      fromlen);
+               wpas_ctrl_sock_debug("ctrl_sock-sendto", sock, reply,
+                                    reply_len);
+               if (sendto(sock, reply, reply_len, 0, (struct sockaddr *) &from,
+                          fromlen) < 0) {
+                       int _errno = errno;
+                       wpa_dbg(wpa_s, MSG_DEBUG,
+                               "ctrl_iface sendto failed: %d - %s",
+                               _errno, strerror(_errno));
+                       if (_errno == ENOBUFS || _errno == EAGAIN) {
+                               /*
+                                * The socket send buffer could be full. This
+                                * may happen if client programs are not
+                                * receiving their pending messages. Close and
+                                * reopen the socket as a workaround to avoid
+                                * getting stuck being unable to send any new
+                                * responses.
+                                */
+                               sock = wpas_ctrl_iface_reinit(wpa_s, priv);
+                               if (sock < 0) {
+                                       wpa_dbg(wpa_s, MSG_DEBUG, "Failed to reinitialize ctrl_iface socket");
+                               }
+                       }
+                       if (new_attached) {
+                               wpa_dbg(wpa_s, MSG_DEBUG, "Failed to send response to ATTACH - detaching");
+                               new_attached = 0;
+                               wpa_supplicant_ctrl_iface_detach(
+                                       &priv->ctrl_dst, &from, fromlen);
+                       }
+               }
        }
+       os_free(reply_buf);
 
        if (new_attached)
                eapol_sm_notify_ctrl_attached(wpa_s->eapol);
@@ -192,7 +286,7 @@ static char * wpa_supplicant_ctrl_iface_path(struct wpa_supplicant *wpa_s)
 {
        char *buf;
        size_t len;
-       char *pbuf, *dir = NULL, *gid_str = NULL;
+       char *pbuf, *dir = NULL;
        int res;
 
        if (wpa_s->conf->ctrl_interface == NULL)
@@ -202,12 +296,11 @@ static char * wpa_supplicant_ctrl_iface_path(struct wpa_supplicant *wpa_s)
        if (pbuf == NULL)
                return NULL;
        if (os_strncmp(pbuf, "DIR=", 4) == 0) {
+               char *gid_str;
                dir = pbuf + 4;
                gid_str = os_strstr(dir, " GROUP=");
-               if (gid_str) {
+               if (gid_str)
                        *gid_str = '\0';
-                       gid_str += 7;
-               }
        } else
                dir = pbuf;
 
@@ -219,7 +312,7 @@ static char * wpa_supplicant_ctrl_iface_path(struct wpa_supplicant *wpa_s)
        }
 
        res = os_snprintf(buf, len, "%s/%s", dir, wpa_s->ifname);
-       if (res < 0 || (size_t) res >= len) {
+       if (os_snprintf_error(len, res)) {
                os_free(pbuf);
                os_free(buf);
                return NULL;
@@ -242,19 +335,38 @@ static char * wpa_supplicant_ctrl_iface_path(struct wpa_supplicant *wpa_s)
 
 
 static void wpa_supplicant_ctrl_iface_msg_cb(void *ctx, int level,
+                                            enum wpa_msg_type type,
                                             const char *txt, size_t len)
 {
        struct wpa_supplicant *wpa_s = ctx;
-       if (wpa_s == NULL || wpa_s->ctrl_iface == NULL)
+
+       if (wpa_s == NULL)
+               return;
+
+       if (type != WPA_MSG_NO_GLOBAL && wpa_s->global->ctrl_iface) {
+               struct ctrl_iface_global_priv *priv = wpa_s->global->ctrl_iface;
+               if (!dl_list_empty(&priv->ctrl_dst)) {
+                       wpa_supplicant_ctrl_iface_send(
+                               wpa_s,
+                               type != WPA_MSG_PER_INTERFACE ?
+                               NULL : wpa_s->ifname,
+                               priv->sock, &priv->ctrl_dst, level, txt, len,
+                               NULL, priv);
+               }
+       }
+
+       if (type == WPA_MSG_ONLY_GLOBAL || wpa_s->ctrl_iface == NULL)
                return;
-       wpa_supplicant_ctrl_iface_send(wpa_s->ctrl_iface, level, txt, len);
+       wpa_supplicant_ctrl_iface_send(wpa_s, NULL, wpa_s->ctrl_iface->sock,
+                                      &wpa_s->ctrl_iface->ctrl_dst,
+                                      level, txt, len, wpa_s->ctrl_iface,
+                                      NULL);
 }
 
 
-struct ctrl_iface_priv *
-wpa_supplicant_ctrl_iface_init(struct wpa_supplicant *wpa_s)
+static int wpas_ctrl_iface_open_sock(struct wpa_supplicant *wpa_s,
+                                    struct ctrl_iface_priv *priv)
 {
-       struct ctrl_iface_priv *priv;
        struct sockaddr_un addr;
        char *fname = NULL;
        gid_t gid = 0;
@@ -262,20 +374,20 @@ wpa_supplicant_ctrl_iface_init(struct wpa_supplicant *wpa_s)
        char *buf, *dir = NULL, *gid_str = NULL;
        struct group *grp;
        char *endp;
-
-       priv = os_zalloc(sizeof(*priv));
-       if (priv == NULL)
-               return NULL;
-       dl_list_init(&priv->ctrl_dst);
-       priv->wpa_s = wpa_s;
-       priv->sock = -1;
-
-       if (wpa_s->conf->ctrl_interface == NULL)
-               return priv;
+       int flags;
 
        buf = os_strdup(wpa_s->conf->ctrl_interface);
        if (buf == NULL)
                goto fail;
+#ifdef ANDROID
+       os_snprintf(addr.sun_path, sizeof(addr.sun_path), "wpa_%s",
+                   wpa_s->conf->ctrl_interface);
+       priv->sock = android_get_control_socket(addr.sun_path);
+       if (priv->sock >= 0) {
+               priv->android_control_socket = 1;
+               goto havesock;
+       }
+#endif /* ANDROID */
        if (os_strncmp(buf, "DIR=", 4) == 0) {
                dir = buf + 4;
                gid_str = os_strstr(dir, " GROUP=");
@@ -293,11 +405,28 @@ wpa_supplicant_ctrl_iface_init(struct wpa_supplicant *wpa_s)
                        wpa_printf(MSG_DEBUG, "Using existing control "
                                   "interface directory.");
                } else {
-                       perror("mkdir[ctrl_interface]");
+                       wpa_printf(MSG_ERROR, "mkdir[ctrl_interface=%s]: %s",
+                                  dir, strerror(errno));
                        goto fail;
                }
        }
 
+#ifdef ANDROID
+       /*
+        * wpa_supplicant is started from /init.*.rc on Android and that seems
+        * to be using umask 0077 which would leave the control interface
+        * directory without group access. This breaks things since Wi-Fi
+        * framework assumes that this directory can be accessed by other
+        * applications in the wifi group. Fix this by adding group access even
+        * if umask value would prevent this.
+        */
+       if (chmod(dir, S_IRWXU | S_IRWXG) < 0) {
+               wpa_printf(MSG_ERROR, "CTRL: Could not chmod directory: %s",
+                          strerror(errno));
+               /* Try to continue anyway */
+       }
+#endif /* ANDROID */
+
        if (gid_str) {
                grp = getgrnam(gid_str);
                if (grp) {
@@ -321,7 +450,8 @@ wpa_supplicant_ctrl_iface_init(struct wpa_supplicant *wpa_s)
        }
 
        if (gid_set && chown(dir, -1, gid) < 0) {
-               perror("chown[ctrl_interface]");
+               wpa_printf(MSG_ERROR, "chown[ctrl_interface=%s,gid=%d]: %s",
+                          dir, (int) gid, strerror(errno));
                goto fail;
        }
 
@@ -341,7 +471,7 @@ wpa_supplicant_ctrl_iface_init(struct wpa_supplicant *wpa_s)
 
        priv->sock = socket(PF_UNIX, SOCK_DGRAM, 0);
        if (priv->sock < 0) {
-               perror("socket(PF_UNIX)");
+               wpa_printf(MSG_ERROR, "socket(PF_UNIX): %s", strerror(errno));
                goto fail;
        }
 
@@ -363,15 +493,15 @@ wpa_supplicant_ctrl_iface_init(struct wpa_supplicant *wpa_s)
                                   " allow connections - assuming it was left"
                                   "over from forced program termination");
                        if (unlink(fname) < 0) {
-                               perror("unlink[ctrl_iface]");
-                               wpa_printf(MSG_ERROR, "Could not unlink "
-                                          "existing ctrl_iface socket '%s'",
-                                          fname);
+                               wpa_printf(MSG_ERROR,
+                                          "Could not unlink existing ctrl_iface socket '%s': %s",
+                                          fname, strerror(errno));
                                goto fail;
                        }
                        if (bind(priv->sock, (struct sockaddr *) &addr,
                                 sizeof(addr)) < 0) {
-                               perror("bind(PF_UNIX)");
+                               wpa_printf(MSG_ERROR, "supp-ctrl-iface-init: bind(PF_UNIX): %s",
+                                          strerror(errno));
                                goto fail;
                        }
                        wpa_printf(MSG_DEBUG, "Successfully replaced leftover "
@@ -388,33 +518,153 @@ wpa_supplicant_ctrl_iface_init(struct wpa_supplicant *wpa_s)
        }
 
        if (gid_set && chown(fname, -1, gid) < 0) {
-               perror("chown[ctrl_interface/ifname]");
+               wpa_printf(MSG_ERROR, "chown[ctrl_interface=%s,gid=%d]: %s",
+                          fname, (int) gid, strerror(errno));
                goto fail;
        }
 
        if (chmod(fname, S_IRWXU | S_IRWXG) < 0) {
-               perror("chmod[ctrl_interface/ifname]");
+               wpa_printf(MSG_ERROR, "chmod[ctrl_interface=%s]: %s",
+                          fname, strerror(errno));
                goto fail;
        }
        os_free(fname);
 
+#ifdef ANDROID
+havesock:
+#endif /* ANDROID */
+
+       /*
+        * Make socket non-blocking so that we don't hang forever if
+        * target dies unexpectedly.
+        */
+       flags = fcntl(priv->sock, F_GETFL);
+       if (flags >= 0) {
+               flags |= O_NONBLOCK;
+               if (fcntl(priv->sock, F_SETFL, flags) < 0) {
+                       wpa_printf(MSG_INFO, "fcntl(ctrl, O_NONBLOCK): %s",
+                                  strerror(errno));
+                       /* Not fatal, continue on.*/
+               }
+       }
+
        eloop_register_read_sock(priv->sock, wpa_supplicant_ctrl_iface_receive,
                                 wpa_s, priv);
        wpa_msg_register_cb(wpa_supplicant_ctrl_iface_msg_cb);
 
        os_free(buf);
-       return priv;
+       return 0;
 
 fail:
-       if (priv->sock >= 0)
+       if (priv->sock >= 0) {
                close(priv->sock);
-       os_free(priv);
+               priv->sock = -1;
+       }
        if (fname) {
                unlink(fname);
                os_free(fname);
        }
        os_free(buf);
-       return NULL;
+       return -1;
+}
+
+
+struct ctrl_iface_priv *
+wpa_supplicant_ctrl_iface_init(struct wpa_supplicant *wpa_s)
+{
+       struct ctrl_iface_priv *priv;
+
+       priv = os_zalloc(sizeof(*priv));
+       if (priv == NULL)
+               return NULL;
+       dl_list_init(&priv->ctrl_dst);
+       priv->wpa_s = wpa_s;
+       priv->sock = -1;
+
+       if (wpa_s->conf->ctrl_interface == NULL)
+               return priv;
+
+#ifdef ANDROID
+       if (wpa_s->global->params.ctrl_interface) {
+               int same = 0;
+
+               if (wpa_s->global->params.ctrl_interface[0] == '/') {
+                       if (os_strcmp(wpa_s->global->params.ctrl_interface,
+                                     wpa_s->conf->ctrl_interface) == 0)
+                               same = 1;
+               } else if (os_strncmp(wpa_s->global->params.ctrl_interface,
+                                     "@android:", 9) == 0 ||
+                          os_strncmp(wpa_s->global->params.ctrl_interface,
+                                     "@abstract:", 10) == 0) {
+                       char *pos;
+
+                       /*
+                        * Currently, Android uses @android:wpa_* as the naming
+                        * convention for the global ctrl interface. This logic
+                        * needs to be revisited if the above naming convention
+                        * is modified.
+                        */
+                       pos = os_strchr(wpa_s->global->params.ctrl_interface,
+                                       '_');
+                       if (pos &&
+                           os_strcmp(pos + 1,
+                                     wpa_s->conf->ctrl_interface) == 0)
+                               same = 1;
+               }
+
+               if (same) {
+                       /*
+                        * The invalid configuration combination might be
+                        * possible to hit in an Android OTA upgrade case, so
+                        * instead of refusing to start the wpa_supplicant
+                        * process, do not open the per-interface ctrl_iface
+                        * and continue with the global control interface that
+                        * was set from the command line since the Wi-Fi
+                        * framework will use it for operations.
+                        */
+                       wpa_printf(MSG_ERROR,
+                                  "global ctrl interface %s matches ctrl interface %s - do not open per-interface ctrl interface",
+                                  wpa_s->global->params.ctrl_interface,
+                                  wpa_s->conf->ctrl_interface);
+                       return priv;
+               }
+       }
+#endif /* ANDROID */
+
+       if (wpas_ctrl_iface_open_sock(wpa_s, priv) < 0) {
+               os_free(priv);
+               return NULL;
+       }
+
+       return priv;
+}
+
+
+static int wpas_ctrl_iface_reinit(struct wpa_supplicant *wpa_s,
+                                 struct ctrl_iface_priv *priv)
+{
+       int res;
+
+       if (priv->sock <= 0)
+               return -1;
+
+       /*
+        * On Android, the control socket being used may be the socket
+        * that is created when wpa_supplicant is started as a /init.*.rc
+        * service. Such a socket is maintained as a key-value pair in
+        * Android's environment. Closing this control socket would leave us
+        * in a bad state with an invalid socket descriptor.
+        */
+       if (priv->android_control_socket)
+               return priv->sock;
+
+       eloop_unregister_read_sock(priv->sock);
+       close(priv->sock);
+       priv->sock = -1;
+       res = wpas_ctrl_iface_open_sock(wpa_s, priv);
+       if (res < 0)
+               return -1;
+       return priv->sock;
 }
 
 
@@ -424,17 +674,17 @@ void wpa_supplicant_ctrl_iface_deinit(struct ctrl_iface_priv *priv)
 
        if (priv->sock > -1) {
                char *fname;
-               char *buf, *dir = NULL, *gid_str = NULL;
+               char *buf, *dir = NULL;
                eloop_unregister_read_sock(priv->sock);
                if (!dl_list_empty(&priv->ctrl_dst)) {
                        /*
-                        * Wait a second before closing the control socket if
+                        * Wait before closing the control socket if
                         * there are any attached monitors in order to allow
                         * them to receive any pending messages.
                         */
                        wpa_printf(MSG_DEBUG, "CTRL_IFACE wait for attached "
                                   "monitors to receive messages");
-                       os_sleep(1, 0);
+                       os_sleep(0, 100000);
                }
                close(priv->sock);
                priv->sock = -1;
@@ -444,16 +694,17 @@ void wpa_supplicant_ctrl_iface_deinit(struct ctrl_iface_priv *priv)
                        os_free(fname);
                }
 
+               if (priv->wpa_s->conf->ctrl_interface == NULL)
+                       goto free_dst;
                buf = os_strdup(priv->wpa_s->conf->ctrl_interface);
                if (buf == NULL)
                        goto free_dst;
                if (os_strncmp(buf, "DIR=", 4) == 0) {
+                       char *gid_str;
                        dir = buf + 4;
                        gid_str = os_strstr(dir, " GROUP=");
-                       if (gid_str) {
+                       if (gid_str)
                                *gid_str = '\0';
-                               gid_str += 7;
-                       }
                } else
                        dir = buf;
 
@@ -463,7 +714,9 @@ void wpa_supplicant_ctrl_iface_deinit(struct ctrl_iface_priv *priv)
                                           "directory not empty - leaving it "
                                           "behind");
                        } else {
-                               perror("rmdir[ctrl_interface]");
+                               wpa_printf(MSG_ERROR,
+                                          "rmdir[ctrl_interface=%s]: %s",
+                                          dir, strerror(errno));
                        }
                }
                os_free(buf);
@@ -479,63 +732,111 @@ free_dst:
 
 /**
  * wpa_supplicant_ctrl_iface_send - Send a control interface packet to monitors
- * @priv: Pointer to private data from wpa_supplicant_ctrl_iface_init()
+ * @ifname: Interface name for global control socket or %NULL
+ * @sock: Local socket fd
+ * @ctrl_dst: List of attached listeners
  * @level: Priority level of the message
  * @buf: Message data
  * @len: Message length
  *
  * Send a packet to all monitor programs attached to the control interface.
  */
-static void wpa_supplicant_ctrl_iface_send(struct ctrl_iface_priv *priv,
+static void wpa_supplicant_ctrl_iface_send(struct wpa_supplicant *wpa_s,
+                                          const char *ifname, int sock,
+                                          struct dl_list *ctrl_dst,
                                           int level, const char *buf,
-                                          size_t len)
+                                          size_t len,
+                                          struct ctrl_iface_priv *priv,
+                                          struct ctrl_iface_global_priv *gp)
 {
        struct wpa_ctrl_dst *dst, *next;
        char levelstr[10];
        int idx, res;
        struct msghdr msg;
-       struct iovec io[2];
+       struct iovec io[5];
 
-       if (priv->sock < 0 || dl_list_empty(&priv->ctrl_dst))
+       if (sock < 0 || dl_list_empty(ctrl_dst))
                return;
 
        res = os_snprintf(levelstr, sizeof(levelstr), "<%d>", level);
-       if (res < 0 || (size_t) res >= sizeof(levelstr))
+       if (os_snprintf_error(sizeof(levelstr), res))
                return;
-       io[0].iov_base = levelstr;
-       io[0].iov_len = os_strlen(levelstr);
-       io[1].iov_base = (char *) buf;
-       io[1].iov_len = len;
+       idx = 0;
+       if (ifname) {
+               io[idx].iov_base = "IFNAME=";
+               io[idx].iov_len = 7;
+               idx++;
+               io[idx].iov_base = (char *) ifname;
+               io[idx].iov_len = os_strlen(ifname);
+               idx++;
+               io[idx].iov_base = " ";
+               io[idx].iov_len = 1;
+               idx++;
+       }
+       io[idx].iov_base = levelstr;
+       io[idx].iov_len = os_strlen(levelstr);
+       idx++;
+       io[idx].iov_base = (char *) buf;
+       io[idx].iov_len = len;
+       idx++;
        os_memset(&msg, 0, sizeof(msg));
        msg.msg_iov = io;
-       msg.msg_iovlen = 2;
+       msg.msg_iovlen = idx;
 
-       idx = 0;
-       dl_list_for_each_safe(dst, next, &priv->ctrl_dst, struct wpa_ctrl_dst,
-                             list) {
-               if (level >= dst->debug_level) {
-                       wpa_hexdump(MSG_DEBUG, "CTRL_IFACE monitor send",
-                                   (u8 *) dst->addr.sun_path, dst->addrlen -
-                                   offsetof(struct sockaddr_un, sun_path));
-                       msg.msg_name = (void *) &dst->addr;
-                       msg.msg_namelen = dst->addrlen;
-                       if (sendmsg(priv->sock, &msg, 0) < 0) {
-                               int _errno = errno;
-                               wpa_printf(MSG_INFO, "CTRL_IFACE monitor[%d]: "
-                                          "%d - %s",
-                                          idx, errno, strerror(errno));
-                               dst->errors++;
-                               if (dst->errors > 1000 ||
-                                   (_errno != ENOBUFS && dst->errors > 10) ||
-                                   _errno == ENOENT) {
-                                       wpa_supplicant_ctrl_iface_detach(
-                                               priv, &dst->addr,
-                                               dst->addrlen);
-                               }
-                       } else
-                               dst->errors = 0;
+       dl_list_for_each_safe(dst, next, ctrl_dst, struct wpa_ctrl_dst, list) {
+               int _errno;
+               char addr_txt[200];
+
+               if (level < dst->debug_level)
+                       continue;
+
+               printf_encode(addr_txt, sizeof(addr_txt),
+                             (u8 *) dst->addr.sun_path, dst->addrlen -
+                             offsetof(struct sockaddr_un, sun_path));
+               msg.msg_name = (void *) &dst->addr;
+               msg.msg_namelen = dst->addrlen;
+               wpas_ctrl_sock_debug("ctrl_sock-sendmsg", sock, buf, len);
+               if (sendmsg(sock, &msg, MSG_DONTWAIT) >= 0) {
+                       wpa_printf(MSG_MSGDUMP,
+                                  "CTRL_IFACE monitor sent successfully to %s",
+                                  addr_txt);
+                       dst->errors = 0;
+                       continue;
+               }
+
+               _errno = errno;
+               wpa_printf(MSG_DEBUG, "CTRL_IFACE monitor[%s]: %d - %s",
+                          addr_txt, errno, strerror(errno));
+               dst->errors++;
+
+               if (dst->errors > 10 || _errno == ENOENT || _errno == EPERM) {
+                       wpa_printf(MSG_INFO, "CTRL_IFACE: Detach monitor %s that cannot receive messages",
+                               addr_txt);
+                       wpa_supplicant_ctrl_iface_detach(ctrl_dst, &dst->addr,
+                                                        dst->addrlen);
+               }
+
+               if (_errno == ENOBUFS || _errno == EAGAIN) {
+                       /*
+                        * The socket send buffer could be full. This may happen
+                        * if client programs are not receiving their pending
+                        * messages. Close and reopen the socket as a workaround
+                        * to avoid getting stuck being unable to send any new
+                        * responses.
+                        */
+                       if (priv)
+                               sock = wpas_ctrl_iface_reinit(wpa_s, priv);
+                       else if (gp)
+                               sock = wpas_ctrl_iface_global_reinit(
+                                       wpa_s->global, gp);
+                       else
+                               break;
+                       if (sock < 0) {
+                               wpa_dbg(wpa_s, MSG_DEBUG,
+                                       "Failed to reinitialize ctrl_iface socket");
+                               break;
+                       }
                }
-               idx++;
        }
 }
 
@@ -555,27 +856,41 @@ void wpa_supplicant_ctrl_iface_wait(struct ctrl_iface_priv *priv)
                res = recvfrom(priv->sock, buf, sizeof(buf) - 1, 0,
                               (struct sockaddr *) &from, &fromlen);
                if (res < 0) {
-                       perror("recvfrom(ctrl_iface)");
+                       wpa_printf(MSG_ERROR, "recvfrom(ctrl_iface): %s",
+                                  strerror(errno));
                        continue;
                }
                buf[res] = '\0';
 
                if (os_strcmp(buf, "ATTACH") == 0) {
                        /* handle ATTACH signal of first monitor interface */
-                       if (!wpa_supplicant_ctrl_iface_attach(priv, &from,
-                                                             fromlen)) {
-                               sendto(priv->sock, "OK\n", 3, 0,
-                                      (struct sockaddr *) &from, fromlen);
+                       if (!wpa_supplicant_ctrl_iface_attach(&priv->ctrl_dst,
+                                                             &from, fromlen,
+                                                             0)) {
+                               if (sendto(priv->sock, "OK\n", 3, 0,
+                                          (struct sockaddr *) &from, fromlen) <
+                                   0) {
+                                       wpa_printf(MSG_DEBUG, "ctrl_iface sendto failed: %s",
+                                                  strerror(errno));
+                               }
                                /* OK to continue */
                                return;
                        } else {
-                               sendto(priv->sock, "FAIL\n", 5, 0,
-                                      (struct sockaddr *) &from, fromlen);
+                               if (sendto(priv->sock, "FAIL\n", 5, 0,
+                                          (struct sockaddr *) &from, fromlen) <
+                                   0) {
+                                       wpa_printf(MSG_DEBUG, "ctrl_iface sendto failed: %s",
+                                                  strerror(errno));
+                               }
                        }
                } else {
                        /* return FAIL for all other signals */
-                       sendto(priv->sock, "FAIL\n", 5, 0,
-                              (struct sockaddr *) &from, fromlen);
+                       if (sendto(priv->sock, "FAIL\n", 5, 0,
+                                  (struct sockaddr *) &from, fromlen) < 0) {
+                               wpa_printf(MSG_DEBUG,
+                                          "ctrl_iface sendto failed: %s",
+                                          strerror(errno));
+                       }
                }
        }
 }
@@ -583,66 +898,116 @@ void wpa_supplicant_ctrl_iface_wait(struct ctrl_iface_priv *priv)
 
 /* Global ctrl_iface */
 
-struct ctrl_iface_global_priv {
-       struct wpa_global *global;
-       int sock;
-};
-
-
 static void wpa_supplicant_global_ctrl_iface_receive(int sock, void *eloop_ctx,
                                                     void *sock_ctx)
 {
        struct wpa_global *global = eloop_ctx;
-       char buf[256];
+       struct ctrl_iface_global_priv *priv = sock_ctx;
+       char buf[4096];
        int res;
        struct sockaddr_un from;
        socklen_t fromlen = sizeof(from);
-       char *reply;
+       char *reply = NULL, *reply_buf = NULL;
        size_t reply_len;
 
        res = recvfrom(sock, buf, sizeof(buf) - 1, 0,
                       (struct sockaddr *) &from, &fromlen);
        if (res < 0) {
-               perror("recvfrom(ctrl_iface)");
+               wpa_printf(MSG_ERROR, "recvfrom(ctrl_iface): %s",
+                          strerror(errno));
                return;
        }
        buf[res] = '\0';
 
-       reply = wpa_supplicant_global_ctrl_iface_process(global, buf,
-                                                        &reply_len);
+       if (os_strcmp(buf, "ATTACH") == 0) {
+               if (wpa_supplicant_ctrl_iface_attach(&priv->ctrl_dst, &from,
+                                                    fromlen, 1))
+                       reply_len = 1;
+               else
+                       reply_len = 2;
+       } else if (os_strcmp(buf, "DETACH") == 0) {
+               if (wpa_supplicant_ctrl_iface_detach(&priv->ctrl_dst, &from,
+                                                    fromlen))
+                       reply_len = 1;
+               else
+                       reply_len = 2;
+       } else {
+               reply_buf = wpa_supplicant_global_ctrl_iface_process(
+                       global, buf, &reply_len);
+               reply = reply_buf;
+
+               /*
+                * There could be some password/key material in the command, so
+                * clear the buffer explicitly now that it is not needed
+                * anymore.
+                */
+               os_memset(buf, 0, res);
+       }
+
+       if (!reply && reply_len == 1) {
+               reply = "FAIL\n";
+               reply_len = 5;
+       } else if (!reply && reply_len == 2) {
+               reply = "OK\n";
+               reply_len = 3;
+       }
 
        if (reply) {
-               sendto(sock, reply, reply_len, 0, (struct sockaddr *) &from,
-                      fromlen);
-               os_free(reply);
-       } else if (reply_len) {
-               sendto(sock, "FAIL\n", 5, 0, (struct sockaddr *) &from,
-                      fromlen);
+               wpas_ctrl_sock_debug("global_ctrl_sock-sendto",
+                                    sock, reply, reply_len);
+               if (sendto(sock, reply, reply_len, 0, (struct sockaddr *) &from,
+                          fromlen) < 0) {
+                       wpa_printf(MSG_DEBUG, "ctrl_iface sendto failed: %s",
+                               strerror(errno));
+               }
        }
+       os_free(reply_buf);
 }
 
 
-struct ctrl_iface_global_priv *
-wpa_supplicant_global_ctrl_iface_init(struct wpa_global *global)
+static int wpas_global_ctrl_iface_open_sock(struct wpa_global *global,
+                                           struct ctrl_iface_global_priv *priv)
 {
-       struct ctrl_iface_global_priv *priv;
        struct sockaddr_un addr;
+       const char *ctrl = global->params.ctrl_interface;
+       int flags;
 
-       priv = os_zalloc(sizeof(*priv));
-       if (priv == NULL)
-               return NULL;
-       priv->global = global;
-       priv->sock = -1;
+       wpa_printf(MSG_DEBUG, "Global control interface '%s'", ctrl);
 
-       if (global->params.ctrl_interface == NULL)
-               return priv;
+#ifdef ANDROID
+       if (os_strncmp(ctrl, "@android:", 9) == 0) {
+               priv->sock = android_get_control_socket(ctrl + 9);
+               if (priv->sock < 0) {
+                       wpa_printf(MSG_ERROR, "Failed to open Android control "
+                                  "socket '%s'", ctrl + 9);
+                       goto fail;
+               }
+               wpa_printf(MSG_DEBUG, "Using Android control socket '%s'",
+                          ctrl + 9);
+               priv->android_control_socket = 1;
+               goto havesock;
+       }
 
-       wpa_printf(MSG_DEBUG, "Global control interface '%s'",
-                  global->params.ctrl_interface);
+       if (os_strncmp(ctrl, "@abstract:", 10) != 0) {
+               /*
+                * Backwards compatibility - try to open an Android control
+                * socket and if that fails, assume this was a UNIX domain
+                * socket instead.
+                */
+               priv->sock = android_get_control_socket(ctrl);
+               if (priv->sock >= 0) {
+                       wpa_printf(MSG_DEBUG,
+                                  "Using Android control socket '%s'",
+                                  ctrl);
+                       priv->android_control_socket = 1;
+                       goto havesock;
+               }
+       }
+#endif /* ANDROID */
 
        priv->sock = socket(PF_UNIX, SOCK_DGRAM, 0);
        if (priv->sock < 0) {
-               perror("socket(PF_UNIX)");
+               wpa_printf(MSG_ERROR, "socket(PF_UNIX): %s", strerror(errno));
                goto fail;
        }
 
@@ -651,62 +1016,203 @@ wpa_supplicant_global_ctrl_iface_init(struct wpa_global *global)
        addr.sun_len = sizeof(addr);
 #endif /* __FreeBSD__ */
        addr.sun_family = AF_UNIX;
-       os_strlcpy(addr.sun_path, global->params.ctrl_interface,
-                  sizeof(addr.sun_path));
+
+       if (os_strncmp(ctrl, "@abstract:", 10) == 0) {
+               addr.sun_path[0] = '\0';
+               os_strlcpy(addr.sun_path + 1, ctrl + 10,
+                          sizeof(addr.sun_path) - 1);
+               if (bind(priv->sock, (struct sockaddr *) &addr, sizeof(addr)) <
+                   0) {
+                       wpa_printf(MSG_ERROR, "supp-global-ctrl-iface-init: "
+                                  "bind(PF_UNIX;%s) failed: %s",
+                                  ctrl, strerror(errno));
+                       goto fail;
+               }
+               wpa_printf(MSG_DEBUG, "Using Abstract control socket '%s'",
+                          ctrl + 10);
+               goto havesock;
+       }
+
+       os_strlcpy(addr.sun_path, ctrl, sizeof(addr.sun_path));
        if (bind(priv->sock, (struct sockaddr *) &addr, sizeof(addr)) < 0) {
-               perror("bind(PF_UNIX)");
+               wpa_printf(MSG_INFO, "supp-global-ctrl-iface-init(%s) (will try fixup): bind(PF_UNIX): %s",
+                          ctrl, strerror(errno));
                if (connect(priv->sock, (struct sockaddr *) &addr,
                            sizeof(addr)) < 0) {
                        wpa_printf(MSG_DEBUG, "ctrl_iface exists, but does not"
                                   " allow connections - assuming it was left"
                                   "over from forced program termination");
-                       if (unlink(global->params.ctrl_interface) < 0) {
-                               perror("unlink[ctrl_iface]");
-                               wpa_printf(MSG_ERROR, "Could not unlink "
-                                          "existing ctrl_iface socket '%s'",
-                                          global->params.ctrl_interface);
+                       if (unlink(ctrl) < 0) {
+                               wpa_printf(MSG_ERROR,
+                                          "Could not unlink existing ctrl_iface socket '%s': %s",
+                                          ctrl, strerror(errno));
                                goto fail;
                        }
                        if (bind(priv->sock, (struct sockaddr *) &addr,
                                 sizeof(addr)) < 0) {
-                               perror("bind(PF_UNIX)");
+                               wpa_printf(MSG_ERROR, "supp-glb-iface-init: bind(PF_UNIX;%s): %s",
+                                          ctrl, strerror(errno));
                                goto fail;
                        }
                        wpa_printf(MSG_DEBUG, "Successfully replaced leftover "
                                   "ctrl_iface socket '%s'",
-                                  global->params.ctrl_interface);
+                                  ctrl);
                } else {
                        wpa_printf(MSG_INFO, "ctrl_iface exists and seems to "
                                   "be in use - cannot override it");
                        wpa_printf(MSG_INFO, "Delete '%s' manually if it is "
                                   "not used anymore",
-                                  global->params.ctrl_interface);
+                                  ctrl);
+                       goto fail;
+               }
+       }
+
+       wpa_printf(MSG_DEBUG, "Using UNIX control socket '%s'", ctrl);
+
+       if (global->params.ctrl_interface_group) {
+               char *gid_str = global->params.ctrl_interface_group;
+               gid_t gid = 0;
+               struct group *grp;
+               char *endp;
+
+               grp = getgrnam(gid_str);
+               if (grp) {
+                       gid = grp->gr_gid;
+                       wpa_printf(MSG_DEBUG, "ctrl_interface_group=%d"
+                                  " (from group name '%s')",
+                                  (int) gid, gid_str);
+               } else {
+                       /* Group name not found - try to parse this as gid */
+                       gid = strtol(gid_str, &endp, 10);
+                       if (*gid_str == '\0' || *endp != '\0') {
+                               wpa_printf(MSG_ERROR, "CTRL: Invalid group "
+                                          "'%s'", gid_str);
+                               goto fail;
+                       }
+                       wpa_printf(MSG_DEBUG, "ctrl_interface_group=%d",
+                                  (int) gid);
+               }
+               if (chown(ctrl, -1, gid) < 0) {
+                       wpa_printf(MSG_ERROR,
+                                  "chown[global_ctrl_interface=%s,gid=%d]: %s",
+                                  ctrl, (int) gid, strerror(errno));
+                       goto fail;
+               }
+
+               if (chmod(ctrl, S_IRWXU | S_IRWXG) < 0) {
+                       wpa_printf(MSG_ERROR,
+                                  "chmod[global_ctrl_interface=%s]: %s",
+                                  ctrl, strerror(errno));
                        goto fail;
                }
+       } else {
+               if (chmod(ctrl, S_IRWXU) < 0) {
+                       wpa_printf(MSG_DEBUG,
+                                  "chmod[global_ctrl_interface=%s](S_IRWXU): %s",
+                                  ctrl, strerror(errno));
+                       /* continue anyway since group change was not required
+                        */
+               }
+       }
+
+havesock:
+
+       /*
+        * Make socket non-blocking so that we don't hang forever if
+        * target dies unexpectedly.
+        */
+       flags = fcntl(priv->sock, F_GETFL);
+       if (flags >= 0) {
+               flags |= O_NONBLOCK;
+               if (fcntl(priv->sock, F_SETFL, flags) < 0) {
+                       wpa_printf(MSG_INFO, "fcntl(ctrl, O_NONBLOCK): %s",
+                                  strerror(errno));
+                       /* Not fatal, continue on.*/
+               }
        }
 
        eloop_register_read_sock(priv->sock,
                                 wpa_supplicant_global_ctrl_iface_receive,
-                                global, NULL);
+                                global, priv);
 
-       return priv;
+       return 0;
 
 fail:
-       if (priv->sock >= 0)
+       if (priv->sock >= 0) {
                close(priv->sock);
-       os_free(priv);
-       return NULL;
+               priv->sock = -1;
+       }
+       return -1;
+}
+
+
+struct ctrl_iface_global_priv *
+wpa_supplicant_global_ctrl_iface_init(struct wpa_global *global)
+{
+       struct ctrl_iface_global_priv *priv;
+
+       priv = os_zalloc(sizeof(*priv));
+       if (priv == NULL)
+               return NULL;
+       dl_list_init(&priv->ctrl_dst);
+       priv->global = global;
+       priv->sock = -1;
+
+       if (global->params.ctrl_interface == NULL)
+               return priv;
+
+       if (wpas_global_ctrl_iface_open_sock(global, priv) < 0) {
+               os_free(priv);
+               return NULL;
+       }
+
+       wpa_msg_register_cb(wpa_supplicant_ctrl_iface_msg_cb);
+
+       return priv;
+}
+
+
+static int wpas_ctrl_iface_global_reinit(struct wpa_global *global,
+                                        struct ctrl_iface_global_priv *priv)
+{
+       int res;
+
+       if (priv->sock <= 0)
+               return -1;
+
+       /*
+        * On Android, the control socket being used may be the socket
+        * that is created when wpa_supplicant is started as a /init.*.rc
+        * service. Such a socket is maintained as a key-value pair in
+        * Android's environment. Closing this control socket would leave us
+        * in a bad state with an invalid socket descriptor.
+        */
+       if (priv->android_control_socket)
+               return priv->sock;
+
+       eloop_unregister_read_sock(priv->sock);
+       close(priv->sock);
+       priv->sock = -1;
+       res = wpas_global_ctrl_iface_open_sock(global, priv);
+       if (res < 0)
+               return -1;
+       return priv->sock;
 }
 
 
 void
 wpa_supplicant_global_ctrl_iface_deinit(struct ctrl_iface_global_priv *priv)
 {
+       struct wpa_ctrl_dst *dst, *prev;
+
        if (priv->sock >= 0) {
                eloop_unregister_read_sock(priv->sock);
                close(priv->sock);
        }
        if (priv->global->params.ctrl_interface)
                unlink(priv->global->params.ctrl_interface);
+       dl_list_for_each_safe(dst, prev, &priv->ctrl_dst, struct wpa_ctrl_dst,
+                             list)
+               os_free(dst);
        os_free(priv);
 }