Android: Force group access to ctrl_iface directory

[android-x86/external-wpa_supplicant_8.git] / wpa_supplicant / ctrl_iface_unix.c

diff --git a/wpa_supplicant/ctrl_iface_unix.c b/wpa_supplicant/ctrl_iface_unix.c
index 31600fc..4dfabc8 100644 (file)
--- a/wpa_supplicant/ctrl_iface_unix.c
+++ b/wpa_supplicant/ctrl_iface_unix.c
@@ -11,6 +11,8 @@
 #include <sys/stat.h>
 #include <grp.h>
 #include <stddef.h>
+#include <unistd.h>
+#include <fcntl.h>
 #ifdef ANDROID
 #include <cutils/sockets.h>
 #endif /* ANDROID */
@@ -173,7 +175,7 @@ static void wpa_supplicant_ctrl_iface_receive(int sock, void *eloop_ctx,
                        if (ifend != NULL)
                                *ifend++ = '\0';
                        else
-                               ifend = "";
+                               *(ifname - 1) = '\0';
                        wpa_printf(MSG_DEBUG, "Found %s", ifname);
                        for (wpa_s = wpa_s->global->ifaces; wpa_s; wpa_s = wpa_s->next) {
                                if (os_strcmp(wpa_s->ifname, ifname + 10) == 0)
@@ -183,9 +185,10 @@ static void wpa_supplicant_ctrl_iface_receive(int sock, void *eloop_ctx,
                                wpa_printf(MSG_ERROR, "P2P: %s does not exist", ifname);
                                wpa_s = eloop_ctx;
                        }
-                       os_memmove(ifname, ifend, strlen(ifend) + 1);
+                       if (ifend != NULL)
+                               os_memmove(ifname, ifend, strlen(ifend) + 1);
+                       wpa_printf(MSG_INFO, "wpa_s->ifname %s cmd %s", wpa_s ? wpa_s->ifname : "NULL", buf);
                }
-               wpa_printf(MSG_INFO, "wpa_s %p cmd %s", wpa_s, buf);
 #endif /* defined CONFIG_P2P && defined ANDROID_P2P */
                reply = wpa_supplicant_ctrl_iface_process(wpa_s, buf,
                                                          &reply_len);
@@ -282,6 +285,7 @@ wpa_supplicant_ctrl_iface_init(struct wpa_supplicant *wpa_s)
        char *buf, *dir = NULL, *gid_str = NULL;
        struct group *grp;
        char *endp;
+       int flags;
 
        priv = os_zalloc(sizeof(*priv));
        if (priv == NULL)
@@ -325,6 +329,22 @@ wpa_supplicant_ctrl_iface_init(struct wpa_supplicant *wpa_s)
                }
        }
 
+#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) {
@@ -428,6 +448,20 @@ wpa_supplicant_ctrl_iface_init(struct wpa_supplicant *wpa_s)
 #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) {
+                       perror("fcntl(ctrl, O_NONBLOCK)");
+                       /* 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);