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

Pull Char/Misc driver merge from Greg Kroah-Hartman:
 "Here is the "big" char/misc driver patches for 3.8-rc1.  I'm starting
  to put random driver subsystems that I had previously sent you through
  the driver-core tree in this tree, as it makes more sense to do so.

  Nothing major here, the various __dev* removals, some mei driver
  updates, and other random driver-specific things from the different
  maintainers and developers.

  Note, some MFD drivers got added through this tree, and they are also
  coming in through the "real" MFD tree as well, due to some major
  mis-communication between me and the different developers.  If you
  have any merge conflicts, take the ones from the MFD tree, not these
  ones, sorry about that.

  All of this has been in linux-next for a while.

  Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>"

Fix up trivial conflict in drivers/mmc/host/Kconfig due to new drivers
having been added (both at the end, as usual..)

* tag 'char-misc-3.8-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc: (84 commits)
  MAINTAINERS: remove drivers/staging/hv/
  misc/st_kim: Free resources in the error path of probe()
  drivers/char: for hpet, add count checking, and ~0UL instead of -1
  w1-gpio: Simplify & get rid of defines
  w1-gpio: Pinctrl-fy
  extcon: remove use of __devexit_p
  extcon: remove use of __devinit
  extcon: remove use of __devexit
  drivers: uio: Only allocate new private data when probing device tree node
  drivers: uio_dmem_genirq: Allow partial success when opening device
  drivers: uio_dmem_genirq: Don't use DMA_ERROR_CODE to indicate unmapped regions
  drivers: uio_dmem_genirq: Don't mix address spaces for dynamic region vaddr
  uio: remove use of __devexit
  uio: remove use of __devinitdata
  uio: remove use of __devinit
  uio: remove use of __devexit_p
  char: remove use of __devexit
  char: remove use of __devinitconst
  char: remove use of __devinitdata
  char: remove use of __devinit
  ...

1 files changed, 27 insertions, 13 deletions

diff --git a/tools/hv/hv_kvp_daemon.c b/tools/hv/hv_kvp_daemon.c
index 5959affd8820..d25a46925e61 100644
--- a/tools/hv/hv_kvp_daemon.c
+++ b/tools/hv/hv_kvp_daemon.c
@@ -43,6 +43,7 @@
 #include <sys/stat.h>
 #include <fcntl.h>
 #include <dirent.h>
+#include <net/if.h>
 
 /*
  * KVP protocol: The user mode component first registers with the
@@ -88,6 +89,7 @@ static char *os_major = "";
 static char *os_minor = "";
 static char *processor_arch;
 static char *os_build;
+static char *os_version;
 static char *lic_version = "Unknown version";
 static struct utsname uts_buf;
 
@@ -297,7 +299,7 @@ static int kvp_file_init(void)
         return 0;
 }
 
-static int kvp_key_delete(int pool, __u8 *key, int key_size)
+static int kvp_key_delete(int pool, const char *key, int key_size)
 {
         int i;
         int j, k;
@@ -340,7 +342,7 @@ static int kvp_key_delete(int pool, __u8 *key, int key_size)
         return 1;
 }
 
-static int kvp_key_add_or_modify(int pool, __u8 *key, int key_size, __u8 *value,
+static int kvp_key_add_or_modify(int pool, const char *key, int key_size, const char *value,
                         int value_size)
 {
         int i;
@@ -394,7 +396,7 @@ static int kvp_key_add_or_modify(int pool, __u8 *key, int key_size, __u8 *value,
         return 0;
 }
 
-static int kvp_get_value(int pool, __u8 *key, int key_size, __u8 *value,
+static int kvp_get_value(int pool, const char *key, int key_size, char *value,
                         int value_size)
 {
         int i;
@@ -426,8 +428,8 @@ static int kvp_get_value(int pool, __u8 *key, int key_size, __u8 *value,
         return 1;
 }
 
-static int kvp_pool_enumerate(int pool, int index, __u8 *key, int key_size,
-                                __u8 *value, int value_size)
+static int kvp_pool_enumerate(int pool, int index, char *key, int key_size,
+                                char *value, int value_size)
 {
         struct kvp_record *record;
 
@@ -453,7 +455,9 @@ void kvp_get_os_info(void)
         char    *p, buf[512];
 
         uname(&uts_buf);
-        os_build = uts_buf.release;
+        os_version = uts_buf.release;
+        os_build = strdup(uts_buf.release);
+
         os_name = uts_buf.sysname;
         processor_arch = uts_buf.machine;
 
@@ -462,7 +466,7 @@ void kvp_get_os_info(void)
          * string to be of the form: x.y.z
          * Strip additional information we may have.
          */
-        p = strchr(os_build, '-');
+        p = strchr(os_version, '-');
         if (p)
                 *p = '\0';
 
@@ -879,7 +883,7 @@ static int kvp_process_ip_address(void *addrp,
                 addr_length = INET6_ADDRSTRLEN;
         }
 
-        if ((length - *offset) < addr_length + 1)
+        if ((length - *offset) < addr_length + 2)
                 return HV_E_FAIL;
         if (str == NULL) {
                 strcpy(buffer, "inet_ntop failed\n");
@@ -887,11 +891,13 @@ static int kvp_process_ip_address(void *addrp,
         }
         if (*offset == 0)
                 strcpy(buffer, tmp);
-        else
+        else {
+                strcat(buffer, ";");
                 strcat(buffer, tmp);
-        strcat(buffer, ";");
+        }
 
         *offset += strlen(str) + 1;
+
         return 0;
 }
 
@@ -953,7 +959,9 @@ kvp_get_ip_info(int family, char *if_name, int op,
                  * supported address families; if not we gather info on
                  * the specified address family.
                  */
-                if ((family != 0) && (curp->ifa_addr->sa_family != family)) {
+                if ((((family != 0) &&
+                         (curp->ifa_addr->sa_family != family))) ||
+                         (curp->ifa_flags & IFF_LOOPBACK)) {
                         curp = curp->ifa_next;
                         continue;
                 }
@@ -1478,13 +1486,19 @@ int main(void)
                 len = recvfrom(fd, kvp_recv_buffer, sizeof(kvp_recv_buffer), 0,
                                 addr_p, &addr_l);
 
-                if (len < 0 || addr.nl_pid) {
+                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);
+                        continue;
+                }
+
                 incoming_msg = (struct nlmsghdr *)kvp_recv_buffer;
                 incoming_cn_msg = (struct cn_msg *)NLMSG_DATA(incoming_msg);
                 hv_msg = (struct hv_kvp_msg *)incoming_cn_msg->data;
@@ -1649,7 +1663,7 @@ int main(void)
                         strcpy(key_name, "OSMinorVersion");
                         break;
                 case OSVersion:
-                        strcpy(key_value, os_build);
+                        strcpy(key_value, os_version);
                         strcpy(key_name, "OSVersion");
                         break;
                 case ProcessorArchitecture: