Merge tag 'char-misc-4.2-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc

Pull char/misc driver updates from Greg KH:
 "Here's the big char/misc driver pull request for 4.2-rc1.

  Lots of mei, extcon, coresight, uio, mic, and other driver updates in
  here.  Full details in the shortlog.  All of these have been in
  linux-next for some time with no reported problems"

* tag 'char-misc-4.2-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc: (176 commits)
  mei: me: wait for power gating exit confirmation
  mei: reset flow control on the last client disconnection
  MAINTAINERS: mei: add mei_cl_bus.h to maintained file list
  misc: sram: sort and clean up included headers
  misc: sram: move reserved block logic out of probe function
  misc: sram: add private struct device and virt_base members
  misc: sram: report correct SRAM pool size
  misc: sram: bump error message level on unclean driver unbinding
  misc: sram: fix device node reference leak on error
  misc: sram: fix enabled clock leak on error path
  misc: mic: Fix reported static checker warning
  misc: mic: Fix randconfig build error by including errno.h
  uio: pruss: Drop depends on ARCH_DAVINCI_DA850 from config
  uio: pruss: Add CONFIG_HAS_IOMEM dependence
  uio: pruss: Include <linux/sizes.h>
  extcon: Redefine the unique id of supported external connectors without 'enum extcon' type
  char:xilinx_hwicap:buffer_icap - change 1/0 to true/false for bool type variable in function buffer_icap_set_configuration().
  Drivers: hv: vmbus: Allocate ring buffer memory in NUMA aware fashion
  parport: check exclusive access before register
  w1: use correct lock on error in w1_seq_show()
  ...

3 files changed, 83 insertions, 247 deletions

diff --git a/tools/hv/hv_fcopy_daemon.c b/tools/hv/hv_fcopy_daemon.c
index 9445d8f264a4..5480e4e424eb 100644
--- a/tools/hv/hv_fcopy_daemon.c
+++ b/tools/hv/hv_fcopy_daemon.c
@@ -137,6 +137,8 @@ int main(int argc, char *argv[])
         int version = FCOPY_CURRENT_VERSION;
         char *buffer[4096 * 2];
         struct hv_fcopy_hdr *in_msg;
+        int in_handshake = 1;
+        __u32 kernel_modver;
 
         static struct option long_options[] = {
                 {"help",        no_argument,       0,  'h' },
@@ -191,6 +193,19 @@ int main(int argc, char *argv[])
                         syslog(LOG_ERR, "pread failed: %s", strerror(errno));
                         exit(EXIT_FAILURE);
                 }
+
+                if (in_handshake) {
+                        if (len != sizeof(kernel_modver)) {
+                                syslog(LOG_ERR, "invalid version negotiation");
+                                exit(EXIT_FAILURE);
+                        }
+                        kernel_modver = *(__u32 *)buffer;
+                        in_handshake = 0;
+                        syslog(LOG_INFO, "HV_FCOPY: kernel module version: %d",
+                               kernel_modver);
+                        continue;
+                }
+
                 in_msg = (struct hv_fcopy_hdr *)buffer;
 
                 switch (in_msg->operation) {
diff --git a/tools/hv/hv_kvp_daemon.c b/tools/hv/hv_kvp_daemon.c
index 408bb076a234..0d9f48ec42bb 100644
--- a/tools/hv/hv_kvp_daemon.c
+++ b/tools/hv/hv_kvp_daemon.c
@@ -33,7 +33,6 @@
 #include <ctype.h>
 #include <errno.h>
 #include <arpa/inet.h>
-#include <linux/connector.h>
 #include <linux/hyperv.h>
 #include <linux/netlink.h>
 #include <ifaddrs.h>
@@ -79,7 +78,6 @@ enum {
         DNS
 };
 
-static struct sockaddr_nl addr;
 static int in_hand_shake = 1;
 
 static char *os_name = "";
@@ -1387,34 +1385,6 @@ kvp_get_domain_name(char *buffer, int length)
         freeaddrinfo(info);
 }
 
-static int
-netlink_send(int fd, struct cn_msg *msg)
-{
-        struct nlmsghdr nlh = { .nlmsg_type = NLMSG_DONE };
-        unsigned int size;
-        struct msghdr message;
-        struct iovec iov[2];
-
-        size = sizeof(struct cn_msg) + msg->len;
-
-        nlh.nlmsg_pid = getpid();
-        nlh.nlmsg_len = NLMSG_LENGTH(size);
-
-        iov[0].iov_base = &nlh;
-        iov[0].iov_len = sizeof(nlh);
-
-        iov[1].iov_base = msg;
-        iov[1].iov_len = size;
-
-        memset(&message, 0, sizeof(message));
-        message.msg_name = &addr;
-        message.msg_namelen = sizeof(addr);
-        message.msg_iov = iov;
-        message.msg_iovlen = 2;
-
-        return sendmsg(fd, &message, 0);
-}
-
 void print_usage(char *argv[])
 {
         fprintf(stderr, "Usage: %s [options]\n"
@@ -1425,22 +1395,17 @@ void print_usage(char *argv[])
 
 int main(int argc, char *argv[])
 {
-        int fd, len, nl_group;
+        int kvp_fd, len;
         int error;
-        struct cn_msg *message;
         struct pollfd pfd;
-        struct nlmsghdr *incoming_msg;
-        struct cn_msg   *incoming_cn_msg;
-        struct hv_kvp_msg *hv_msg;
-        char    *p;
+        char    *p;
+        struct hv_kvp_msg hv_msg[1];
         char    *key_value;
         char    *key_name;
         int     op;
         int     pool;
         char    *if_name;
         struct hv_kvp_ipaddr_value *kvp_ip_val;
-        char *kvp_recv_buffer;
-        size_t kvp_recv_buffer_len;
         int daemonize = 1, long_index = 0, opt;
 
         static struct option long_options[] = {
@@ -1468,12 +1433,14 @@ int main(int argc, char *argv[])
         openlog("KVP", 0, LOG_USER);
         syslog(LOG_INFO, "KVP starting; pid is:%d", getpid());
 
-        kvp_recv_buffer_len = NLMSG_LENGTH(0) + sizeof(struct cn_msg) + sizeof(struct hv_kvp_msg);
-        kvp_recv_buffer = calloc(1, kvp_recv_buffer_len);
-        if (!kvp_recv_buffer) {
-                syslog(LOG_ERR, "Failed to allocate netlink buffer");
+        kvp_fd = open("/dev/vmbus/hv_kvp", O_RDWR);
+
+        if (kvp_fd < 0) {
+                syslog(LOG_ERR, "open /dev/vmbus/hv_kvp failed; error: %d %s",
+                        errno, strerror(errno));
                 exit(EXIT_FAILURE);
         }
+
         /*
          * Retrieve OS release information.
          */
@@ -1489,100 +1456,44 @@ int main(int argc, char *argv[])
                 exit(EXIT_FAILURE);
         }
 
-        fd = socket(AF_NETLINK, SOCK_DGRAM, NETLINK_CONNECTOR);
-        if (fd < 0) {
-                syslog(LOG_ERR, "netlink socket creation failed; error: %d %s", errno,
-                                strerror(errno));
-                exit(EXIT_FAILURE);
-        }
-        addr.nl_family = AF_NETLINK;
-        addr.nl_pad = 0;
-        addr.nl_pid = 0;
-        addr.nl_groups = 0;
-
-
-        error = bind(fd, (struct sockaddr *)&addr, sizeof(addr));
-        if (error < 0) {
-                syslog(LOG_ERR, "bind failed; error: %d %s", errno, strerror(errno));
-                close(fd);
-                exit(EXIT_FAILURE);
-        }
-        nl_group = CN_KVP_IDX;
-
-        if (setsockopt(fd, SOL_NETLINK, NETLINK_ADD_MEMBERSHIP, &nl_group, sizeof(nl_group)) < 0) {
-                syslog(LOG_ERR, "setsockopt failed; error: %d %s", errno, strerror(errno));
-                close(fd);
-                exit(EXIT_FAILURE);
-        }
-
         /*
          * Register ourselves with the kernel.
          */
-        message = (struct cn_msg *)kvp_recv_buffer;
-        message->id.idx = CN_KVP_IDX;
-        message->id.val = CN_KVP_VAL;
-
-        hv_msg = (struct hv_kvp_msg *)message->data;
         hv_msg->kvp_hdr.operation = KVP_OP_REGISTER1;
-        message->ack = 0;
-        message->len = sizeof(struct hv_kvp_msg);
-
-        len = netlink_send(fd, message);
-        if (len < 0) {
-                syslog(LOG_ERR, "netlink_send failed; error: %d %s", errno, strerror(errno));
-                close(fd);
+        len = write(kvp_fd, hv_msg, sizeof(struct hv_kvp_msg));
+        if (len != sizeof(struct hv_kvp_msg)) {
+                syslog(LOG_ERR, "registration to kernel failed; error: %d %s",
+                       errno, strerror(errno));
+                close(kvp_fd);
                 exit(EXIT_FAILURE);
         }
 
-        pfd.fd = fd;
+        pfd.fd = kvp_fd;
 
         while (1) {
-                struct sockaddr *addr_p = (struct sockaddr *) &addr;
-                socklen_t addr_l = sizeof(addr);
                 pfd.events = POLLIN;
                 pfd.revents = 0;
 
                 if (poll(&pfd, 1, -1) < 0) {
                         syslog(LOG_ERR, "poll failed; error: %d %s", errno, strerror(errno));
                         if (errno == EINVAL) {
-                                close(fd);
+                                close(kvp_fd);
                                 exit(EXIT_FAILURE);
                         }
                         else
                                 continue;
                 }
 
-                len = recvfrom(fd, kvp_recv_buffer, kvp_recv_buffer_len, 0,
-                                addr_p, &addr_l);
-
-                if (len < 0) {
-                        int saved_errno = errno;
-                        syslog(LOG_ERR, "recvfrom failed; pid:%u error:%d %s",
-                                        addr.nl_pid, errno, strerror(errno));
+                len = read(kvp_fd, hv_msg, sizeof(struct hv_kvp_msg));
 
-                        if (saved_errno == ENOBUFS) {
-                                syslog(LOG_ERR, "receive error: ignored");
-                                continue;
-                        }
+                if (len != sizeof(struct hv_kvp_msg)) {
+                        syslog(LOG_ERR, "read failed; error:%d %s",
+                               errno, strerror(errno));
 
-                        close(fd);
-                        return -1;
+                        close(kvp_fd);
+                        return EXIT_FAILURE;
                 }
 
-                if (addr.nl_pid) {
-                        syslog(LOG_WARNING, "Received packet from untrusted pid:%u",
-                                        addr.nl_pid);
-                        continue;
-                }
-
-                incoming_msg = (struct nlmsghdr *)kvp_recv_buffer;
-
-                if (incoming_msg->nlmsg_type != NLMSG_DONE)
-                        continue;
-
-                incoming_cn_msg = (struct cn_msg *)NLMSG_DATA(incoming_msg);
-                hv_msg = (struct hv_kvp_msg *)incoming_cn_msg->data;
-
                 /*
                  * We will use the KVP header information to pass back
                  * the error from this daemon. So, first copy the state
@@ -1603,7 +1514,7 @@ int main(int argc, char *argv[])
                         if (lic_version) {
                                 strcpy(lic_version, p);
                                 syslog(LOG_INFO, "KVP LIC Version: %s",
-                                        lic_version);
+                                       lic_version);
                         } else {
                                 syslog(LOG_ERR, "malloc failed");
                         }
@@ -1702,7 +1613,6 @@ int main(int argc, char *argv[])
                         goto kvp_done;
                 }
 
-                hv_msg = (struct hv_kvp_msg *)incoming_cn_msg->data;
                 key_name = (char *)hv_msg->body.kvp_enum_data.data.key;
                 key_value = (char *)hv_msg->body.kvp_enum_data.data.value;
 
@@ -1753,31 +1663,17 @@ int main(int argc, char *argv[])
                         hv_msg->error = HV_S_CONT;
                         break;
                 }
-                /*
-                 * Send the value back to the kernel. The response is
-                 * already in the receive buffer. Update the cn_msg header to
-                 * reflect the key value that has been added to the message
-                 */
-kvp_done:
-
-                incoming_cn_msg->id.idx = CN_KVP_IDX;
-                incoming_cn_msg->id.val = CN_KVP_VAL;
-                incoming_cn_msg->ack = 0;
-                incoming_cn_msg->len = sizeof(struct hv_kvp_msg);
-
-                len = netlink_send(fd, incoming_cn_msg);
-                if (len < 0) {
-                        int saved_errno = errno;
-                        syslog(LOG_ERR, "net_link send failed; error: %d %s", errno,
-                                        strerror(errno));
-
-                        if (saved_errno == ENOMEM || saved_errno == ENOBUFS) {
-                                syslog(LOG_ERR, "send error: ignored");
-                                continue;
-                        }
 
+                /* Send the value back to the kernel. */
+kvp_done:
+                len = write(kvp_fd, hv_msg, sizeof(struct hv_kvp_msg));
+                if (len != sizeof(struct hv_kvp_msg)) {
+                        syslog(LOG_ERR, "write failed; error: %d %s", errno,
+                               strerror(errno));
                         exit(EXIT_FAILURE);
                 }
         }
 
+        close(kvp_fd);
+        exit(0);
 }
diff --git a/tools/hv/hv_vss_daemon.c b/tools/hv/hv_vss_daemon.c
index 506dd0148828..96234b638249 100644
--- a/tools/hv/hv_vss_daemon.c
+++ b/tools/hv/hv_vss_daemon.c
@@ -19,7 +19,6 @@
 
 
 #include <sys/types.h>
-#include <sys/socket.h>
 #include <sys/poll.h>
 #include <sys/ioctl.h>
 #include <fcntl.h>
@@ -30,21 +29,11 @@
 #include <string.h>
 #include <ctype.h>
 #include <errno.h>
-#include <arpa/inet.h>
 #include <linux/fs.h>
-#include <linux/connector.h>
 #include <linux/hyperv.h>
-#include <linux/netlink.h>
 #include <syslog.h>
 #include <getopt.h>
 
-static struct sockaddr_nl addr;
-
-#ifndef SOL_NETLINK
-#define SOL_NETLINK 270
-#endif
-
-
 /* Don't use syslog() in the function since that can cause write to disk */
 static int vss_do_freeze(char *dir, unsigned int cmd)
 {
@@ -143,33 +132,6 @@ out:
         return error;
 }
 
-static int netlink_send(int fd, struct cn_msg *msg)
-{
-        struct nlmsghdr nlh = { .nlmsg_type = NLMSG_DONE };
-        unsigned int size;
-        struct msghdr message;
-        struct iovec iov[2];
-
-        size = sizeof(struct cn_msg) + msg->len;
-
-        nlh.nlmsg_pid = getpid();
-        nlh.nlmsg_len = NLMSG_LENGTH(size);
-
-        iov[0].iov_base = &nlh;
-        iov[0].iov_len = sizeof(nlh);
-
-        iov[1].iov_base = msg;
-        iov[1].iov_len = size;
-
-        memset(&message, 0, sizeof(message));
-        message.msg_name = &addr;
-        message.msg_namelen = sizeof(addr);
-        message.msg_iov = iov;
-        message.msg_iovlen = 2;
-
-        return sendmsg(fd, &message, 0);
-}
-
 void print_usage(char *argv[])
 {
         fprintf(stderr, "Usage: %s [options]\n"
@@ -180,17 +142,14 @@ void print_usage(char *argv[])
 
 int main(int argc, char *argv[])
 {
-        int fd, len, nl_group;
+        int vss_fd, len;
         int error;
-        struct cn_msg *message;
         struct pollfd pfd;
-        struct nlmsghdr *incoming_msg;
-        struct cn_msg   *incoming_cn_msg;
         int     op;
-        struct hv_vss_msg *vss_msg;
-        char *vss_recv_buffer;
-        size_t vss_recv_buffer_len;
+        struct hv_vss_msg vss_msg[1];
         int daemonize = 1, long_index = 0, opt;
+        int in_handshake = 1;
+        __u32 kernel_modver;
 
         static struct option long_options[] = {
                 {"help",        no_argument,       0,  'h' },
@@ -217,98 +176,62 @@ int main(int argc, char *argv[])
         openlog("Hyper-V VSS", 0, LOG_USER);
         syslog(LOG_INFO, "VSS starting; pid is:%d", getpid());
 
-        vss_recv_buffer_len = NLMSG_LENGTH(0) + sizeof(struct cn_msg) + sizeof(struct hv_vss_msg);
-        vss_recv_buffer = calloc(1, vss_recv_buffer_len);
-        if (!vss_recv_buffer) {
-                syslog(LOG_ERR, "Failed to allocate netlink buffers");
-                exit(EXIT_FAILURE);
-        }
-
-        fd = socket(AF_NETLINK, SOCK_DGRAM, NETLINK_CONNECTOR);
-        if (fd < 0) {
-                syslog(LOG_ERR, "netlink socket creation failed; error:%d %s",
-                                errno, strerror(errno));
-                exit(EXIT_FAILURE);
-        }
-        addr.nl_family = AF_NETLINK;
-        addr.nl_pad = 0;
-        addr.nl_pid = 0;
-        addr.nl_groups = 0;
-
-
-        error = bind(fd, (struct sockaddr *)&addr, sizeof(addr));
-        if (error < 0) {
-                syslog(LOG_ERR, "bind failed; error:%d %s", errno, strerror(errno));
-                close(fd);
-                exit(EXIT_FAILURE);
-        }
-        nl_group = CN_VSS_IDX;
-        if (setsockopt(fd, SOL_NETLINK, NETLINK_ADD_MEMBERSHIP, &nl_group, sizeof(nl_group)) < 0) {
-                syslog(LOG_ERR, "setsockopt failed; error:%d %s", errno, strerror(errno));
-                close(fd);
+        vss_fd = open("/dev/vmbus/hv_vss", O_RDWR);
+        if (vss_fd < 0) {
+                syslog(LOG_ERR, "open /dev/vmbus/hv_vss failed; error: %d %s",
+                       errno, strerror(errno));
                 exit(EXIT_FAILURE);
         }
         /*
          * Register ourselves with the kernel.
          */
-        message = (struct cn_msg *)vss_recv_buffer;
-        message->id.idx = CN_VSS_IDX;
-        message->id.val = CN_VSS_VAL;
-        message->ack = 0;
-        vss_msg = (struct hv_vss_msg *)message->data;
-        vss_msg->vss_hdr.operation = VSS_OP_REGISTER;
+        vss_msg->vss_hdr.operation = VSS_OP_REGISTER1;
 
-        message->len = sizeof(struct hv_vss_msg);
-
-        len = netlink_send(fd, message);
+        len = write(vss_fd, vss_msg, sizeof(struct hv_vss_msg));
         if (len < 0) {
-                syslog(LOG_ERR, "netlink_send failed; error:%d %s", errno, strerror(errno));
-                close(fd);
+                syslog(LOG_ERR, "registration to kernel failed; error: %d %s",
+                       errno, strerror(errno));
+                close(vss_fd);
                 exit(EXIT_FAILURE);
         }
 
-        pfd.fd = fd;
+        pfd.fd = vss_fd;
 
         while (1) {
-                struct sockaddr *addr_p = (struct sockaddr *) &addr;
-                socklen_t addr_l = sizeof(addr);
                 pfd.events = POLLIN;
                 pfd.revents = 0;
 
                 if (poll(&pfd, 1, -1) < 0) {
                         syslog(LOG_ERR, "poll failed; error:%d %s", errno, strerror(errno));
                         if (errno == EINVAL) {
-                                close(fd);
+                                close(vss_fd);
                                 exit(EXIT_FAILURE);
                         }
                         else
                                 continue;
                 }
 
-                len = recvfrom(fd, vss_recv_buffer, vss_recv_buffer_len, 0,
-                                addr_p, &addr_l);
+                len = read(vss_fd, vss_msg, sizeof(struct hv_vss_msg));
 
-                if (len < 0) {
-                        syslog(LOG_ERR, "recvfrom failed; pid:%u error:%d %s",
-                                        addr.nl_pid, errno, strerror(errno));
-                        close(fd);
-                        return -1;
-                }
-
-                if (addr.nl_pid) {
-                        syslog(LOG_WARNING,
-                                "Received packet from untrusted pid:%u",
-                                addr.nl_pid);
+                if (in_handshake) {
+                        if (len != sizeof(kernel_modver)) {
+                                syslog(LOG_ERR, "invalid version negotiation");
+                                exit(EXIT_FAILURE);
+                        }
+                        kernel_modver = *(__u32 *)vss_msg;
+                        in_handshake = 0;
+                        syslog(LOG_INFO, "VSS: kernel module version: %d",
+                               kernel_modver);
                         continue;
                 }
 
-                incoming_msg = (struct nlmsghdr *)vss_recv_buffer;
-
-                if (incoming_msg->nlmsg_type != NLMSG_DONE)
-                        continue;
+                if (len != sizeof(struct hv_vss_msg)) {
+                        syslog(LOG_ERR, "read failed; error:%d %s",
+                               errno, strerror(errno));
+                        close(vss_fd);
+                        return EXIT_FAILURE;
+                }
 
-                incoming_cn_msg = (struct cn_msg *)NLMSG_DATA(incoming_msg);
-                vss_msg = (struct hv_vss_msg *)incoming_cn_msg->data;
                 op = vss_msg->vss_hdr.operation;
                 error =  HV_S_OK;
 
@@ -331,12 +254,14 @@ int main(int argc, char *argv[])
                         syslog(LOG_ERR, "Illegal op:%d\n", op);
                 }
                 vss_msg->error = error;
-                len = netlink_send(fd, incoming_cn_msg);
-                if (len < 0) {
-                        syslog(LOG_ERR, "net_link send failed; error:%d %s",
-                                        errno, strerror(errno));
+                len = write(vss_fd, &error, sizeof(struct hv_vss_msg));
+                if (len != sizeof(struct hv_vss_msg)) {
+                        syslog(LOG_ERR, "write failed; error: %d %s", errno,
+                               strerror(errno));
                         exit(EXIT_FAILURE);
                 }
         }
 
+        close(vss_fd);
+        exit(0);
 }