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

Pull char/misc patches from Greg KH:
 "Here is the big char/misc driver pull request for 3.12-rc1

  Lots of driver updates all over the char/misc tree, full details in
  the shortlog"

* tag 'char-misc-3.12-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc: (62 commits)
  drivers: uio: Kconfig: add MMU dependancy for UIO
  drivers: uio: Add driver for Humusoft MF624 DAQ PCI card
  drivers: uio_pdrv_genirq: use dev_get_platdata()
  drivers: uio_pruss: use dev_get_platdata()
  drivers: uio_dmem_genirq: use dev_get_platdata()
  drivers: parport: Kconfig: exclude h8300 for PARPORT_PC
  drivers: misc: ti-st: fix potential race if st_kim_start fails
  Drivers: hv: vmbus: Do not attempt to negoatiate a new version prematurely
  misc: vmw_balloon: Remove braces to fix build for clang.
  Drivers: hv: vmbus: Fix a bug in the handling of channel offers
  vme: vme_ca91cx42.c: fix to pass correct device identity to free_irq()
  VMCI: Add support for virtual IOMMU
  VMCI: Remove non-blocking/pinned queuepair support
  uio: uio_pruss: remove unnecessary platform_set_drvdata()
  parport: amiga: remove unnecessary platform_set_drvdata()
  vme: vme_vmivme7805.c: add missing __iomem annotation
  vme: vme_ca91cx42.c: add missing __iomem annotation
  vme: vme_tsi148.c: add missing __iomem annotation
  drivers/misc/hpilo: Correct panic when an AUX iLO is detected
  uio: drop unused vma_count member in uio_device struct
  ...

2 files changed, 65 insertions, 38 deletions

diff --git a/tools/hv/hv_kvp_daemon.c b/tools/hv/hv_kvp_daemon.c
index 07819bfa7dba..8fd9ec66121c 100644
--- a/tools/hv/hv_kvp_daemon.c
+++ b/tools/hv/hv_kvp_daemon.c
@@ -79,8 +79,6 @@ enum {
         DNS
 };
 
-static char kvp_send_buffer[4096];
-static char kvp_recv_buffer[4096 * 2];
 static struct sockaddr_nl addr;
 static int in_hand_shake = 1;
 
@@ -1301,6 +1299,7 @@ static int kvp_set_ip_info(char *if_name, struct hv_kvp_ipaddr_value *new_val)
         }
 
         error = kvp_write_file(file, "HWADDR", "", mac_addr);
+        free(mac_addr);
         if (error)
                 goto setval_error;
 
@@ -1346,7 +1345,6 @@ static int kvp_set_ip_info(char *if_name, struct hv_kvp_ipaddr_value *new_val)
                 goto setval_error;
 
 setval_done:
-        free(mac_addr);
         fclose(file);
 
         /*
@@ -1355,12 +1353,15 @@ setval_done:
          */
 
         snprintf(cmd, sizeof(cmd), "%s %s", "hv_set_ifconfig", if_file);
-        system(cmd);
+        if (system(cmd)) {
+                syslog(LOG_ERR, "Failed to execute cmd '%s'; error: %d %s",
+                                cmd, errno, strerror(errno));
+                return HV_E_FAIL;
+        }
         return 0;
 
 setval_error:
         syslog(LOG_ERR, "Failed to write config file");
-        free(mac_addr);
         fclose(file);
         return error;
 }
@@ -1391,23 +1392,18 @@ kvp_get_domain_name(char *buffer, int length)
 static int
 netlink_send(int fd, struct cn_msg *msg)
 {
-        struct nlmsghdr *nlh;
+        struct nlmsghdr nlh = { .nlmsg_type = NLMSG_DONE };
         unsigned int size;
         struct msghdr message;
-        char buffer[64];
         struct iovec iov[2];
 
-        size = NLMSG_SPACE(sizeof(struct cn_msg) + msg->len);
+        size = sizeof(struct cn_msg) + msg->len;
 
-        nlh = (struct nlmsghdr *)buffer;
-        nlh->nlmsg_seq = 0;
-        nlh->nlmsg_pid = getpid();
-        nlh->nlmsg_type = NLMSG_DONE;
-        nlh->nlmsg_len = NLMSG_LENGTH(size - sizeof(*nlh));
-        nlh->nlmsg_flags = 0;
+        nlh.nlmsg_pid = getpid();
+        nlh.nlmsg_len = NLMSG_LENGTH(size);
 
-        iov[0].iov_base = nlh;
-        iov[0].iov_len = sizeof(*nlh);
+        iov[0].iov_base = &nlh;
+        iov[0].iov_len = sizeof(nlh);
 
         iov[1].iov_base = msg;
         iov[1].iov_len = size;
@@ -1437,10 +1433,22 @@ int main(void)
         int     pool;
         char    *if_name;
         struct hv_kvp_ipaddr_value *kvp_ip_val;
+        char *kvp_send_buffer;
+        char *kvp_recv_buffer;
+        size_t kvp_recv_buffer_len;
 
-        daemon(1, 0);
+        if (daemon(1, 0))
+                return 1;
         openlog("KVP", 0, LOG_USER);
         syslog(LOG_INFO, "KVP starting; pid is:%d", getpid());
+
+        kvp_recv_buffer_len = NLMSG_HDRLEN + sizeof(struct cn_msg) + sizeof(struct hv_kvp_msg);
+        kvp_send_buffer = calloc(1, kvp_recv_buffer_len);
+        kvp_recv_buffer = calloc(1, kvp_recv_buffer_len);
+        if (!(kvp_send_buffer && kvp_recv_buffer)) {
+                syslog(LOG_ERR, "Failed to allocate netlink buffers");
+                exit(EXIT_FAILURE);
+        }
         /*
          * Retrieve OS release information.
          */
@@ -1514,7 +1522,7 @@ int main(void)
                                 continue;
                 }
 
-                len = recvfrom(fd, kvp_recv_buffer, sizeof(kvp_recv_buffer), 0,
+                len = recvfrom(fd, kvp_recv_buffer, kvp_recv_buffer_len, 0,
                                 addr_p, &addr_l);
 
                 if (len < 0) {
diff --git a/tools/hv/hv_vss_daemon.c b/tools/hv/hv_vss_daemon.c
index fea03a3edaf4..8611962c672c 100644
--- a/tools/hv/hv_vss_daemon.c
+++ b/tools/hv/hv_vss_daemon.c
@@ -38,8 +38,6 @@
 #include <linux/netlink.h>
 #include <syslog.h>
 
-static char vss_recv_buffer[4096];
-static char vss_send_buffer[4096];
 static struct sockaddr_nl addr;
 
 #ifndef SOL_NETLINK
@@ -107,23 +105,18 @@ static int vss_operate(int operation)
 
 static int netlink_send(int fd, struct cn_msg *msg)
 {
-        struct nlmsghdr *nlh;
+        struct nlmsghdr nlh = { .nlmsg_type = NLMSG_DONE };
         unsigned int size;
         struct msghdr message;
-        char buffer[64];
         struct iovec iov[2];
 
-        size = NLMSG_SPACE(sizeof(struct cn_msg) + msg->len);
+        size = sizeof(struct cn_msg) + msg->len;
 
-        nlh = (struct nlmsghdr *)buffer;
-        nlh->nlmsg_seq = 0;
-        nlh->nlmsg_pid = getpid();
-        nlh->nlmsg_type = NLMSG_DONE;
-        nlh->nlmsg_len = NLMSG_LENGTH(size - sizeof(*nlh));
-        nlh->nlmsg_flags = 0;
+        nlh.nlmsg_pid = getpid();
+        nlh.nlmsg_len = NLMSG_LENGTH(size);
 
-        iov[0].iov_base = nlh;
-        iov[0].iov_len = sizeof(*nlh);
+        iov[0].iov_base = &nlh;
+        iov[0].iov_len = sizeof(nlh);
 
         iov[1].iov_base = msg;
         iov[1].iov_len = size;
@@ -147,6 +140,9 @@ int main(void)
         struct cn_msg   *incoming_cn_msg;
         int     op;
         struct hv_vss_msg *vss_msg;
+        char *vss_send_buffer;
+        char *vss_recv_buffer;
+        size_t vss_recv_buffer_len;
 
         if (daemon(1, 0))
                 return 1;
@@ -154,9 +150,18 @@ int main(void)
         openlog("Hyper-V VSS", 0, LOG_USER);
         syslog(LOG_INFO, "VSS starting; pid is:%d", getpid());
 
+        vss_recv_buffer_len = NLMSG_HDRLEN + sizeof(struct cn_msg) + sizeof(struct hv_vss_msg);
+        vss_send_buffer = calloc(1, vss_recv_buffer_len);
+        vss_recv_buffer = calloc(1, vss_recv_buffer_len);
+        if (!(vss_send_buffer && 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", fd);
+                syslog(LOG_ERR, "netlink socket creation failed; error:%d %s",
+                                errno, strerror(errno));
                 exit(EXIT_FAILURE);
         }
         addr.nl_family = AF_NETLINK;
@@ -167,12 +172,16 @@ int main(void)
 
         error = bind(fd, (struct sockaddr *)&addr, sizeof(addr));
         if (error < 0) {
-                syslog(LOG_ERR, "bind failed; error:%d", error);
+                syslog(LOG_ERR, "bind failed; error:%d %s", errno, strerror(errno));
                 close(fd);
                 exit(EXIT_FAILURE);
         }
         nl_group = CN_VSS_IDX;
-        setsockopt(fd, SOL_NETLINK, NETLINK_ADD_MEMBERSHIP, &nl_group, sizeof(nl_group));
+        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.
          */
@@ -187,7 +196,7 @@ int main(void)
 
         len = netlink_send(fd, message);
         if (len < 0) {
-                syslog(LOG_ERR, "netlink_send failed; error:%d", len);
+                syslog(LOG_ERR, "netlink_send failed; error:%d %s", errno, strerror(errno));
                 close(fd);
                 exit(EXIT_FAILURE);
         }
@@ -199,9 +208,18 @@ int main(void)
                 socklen_t addr_l = sizeof(addr);
                 pfd.events = POLLIN;
                 pfd.revents = 0;
-                poll(&pfd, 1, -1);
 
-                len = recvfrom(fd, vss_recv_buffer, sizeof(vss_recv_buffer), 0,
+                if (poll(&pfd, 1, -1) < 0) {
+                        syslog(LOG_ERR, "poll failed; error:%d %s", errno, strerror(errno));
+                        if (errno == EINVAL) {
+                                close(fd);
+                                exit(EXIT_FAILURE);
+                        }
+                        else
+                                continue;
+                }
+
+                len = recvfrom(fd, vss_recv_buffer, vss_recv_buffer_len, 0,
                                 addr_p, &addr_l);
 
                 if (len < 0) {
@@ -241,7 +259,8 @@ int main(void)
                 vss_msg->error = error;
                 len = netlink_send(fd, incoming_cn_msg);
                 if (len < 0) {
-                        syslog(LOG_ERR, "net_link send failed; error:%d", len);
+                        syslog(LOG_ERR, "net_link send failed; error:%d %s",
+                                        errno, strerror(errno));
                         exit(EXIT_FAILURE);
                 }
         }