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

Pull char / misc patches from Greg KH:
 "Here's the big char/misc driver update for 3.20-rc1.

  Lots of little things in here, all described in the changelog.
  Nothing major or unusual, except maybe the binder selinux stuff, which
  was all acked by the proper selinux people and they thought it best to
  come through this tree.

  All of this has been in linux-next with no reported issues for a while"

* tag 'char-misc-3.20-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc: (90 commits)
  coresight: fix function etm_writel_cp14() parameter order
  coresight-etm: remove check for unknown Kconfig macro
  coresight: fixing CPU hwid lookup in device tree
  coresight: remove the unnecessary function coresight_is_bit_set()
  coresight: fix the debug AMBA bus name
  coresight: remove the extra spaces
  coresight: fix the link between orphan connection and newly added device
  coresight: remove the unnecessary replicator property
  coresight: fix the replicator subtype value
  pdfdocs: Fix 'make pdfdocs' failure for 'uio-howto.tmpl'
  mcb: Fix error path of mcb_pci_probe
  virtio/console: verify device has config space
  ti-st: clean up data types (fix harmless memory corruption)
  mei: me: release hw from reset only during the reset flow
  mei: mask interrupt set bit on clean reset bit
  extcon: max77693: Constify struct regmap_config
  extcon: adc-jack: Release IIO channel on driver remove
  extcon: Remove duplicated include from extcon-class.c
  Drivers: hv: vmbus: hv_process_timer_expiration() can be static
  Drivers: hv: vmbus: serialize Offer and Rescind offer
  ...

3 files changed, 23 insertions, 32 deletions

diff --git a/tools/hv/Makefile b/tools/hv/Makefile
index bd22f786a60c..99ffe61051a7 100644
--- a/tools/hv/Makefile
+++ b/tools/hv/Makefile
@@ -5,9 +5,9 @@ PTHREAD_LIBS = -lpthread
 WARNINGS = -Wall -Wextra
 CFLAGS = $(WARNINGS) -g $(PTHREAD_LIBS)
 
-all: hv_kvp_daemon hv_vss_daemon
+all: hv_kvp_daemon hv_vss_daemon hv_fcopy_daemon
 %: %.c
         $(CC) $(CFLAGS) -o $@ $^
 
 clean:
-        $(RM) hv_kvp_daemon hv_vss_daemon
+        $(RM) hv_kvp_daemon hv_vss_daemon hv_fcopy_daemon
diff --git a/tools/hv/hv_fcopy_daemon.c b/tools/hv/hv_fcopy_daemon.c
index f437d739f37d..9445d8f264a4 100644
--- a/tools/hv/hv_fcopy_daemon.c
+++ b/tools/hv/hv_fcopy_daemon.c
@@ -43,15 +43,9 @@ static int hv_start_fcopy(struct hv_start_fcopy *smsg)
         int error = HV_E_FAIL;
         char *q, *p;
 
-        /*
-         * If possile append a path seperator to the path.
-         */
-        if (strlen((char *)smsg->path_name) < (W_MAX_PATH - 2))
-                strcat((char *)smsg->path_name, "/");
-
         p = (char *)smsg->path_name;
         snprintf(target_fname, sizeof(target_fname), "%s/%s",
-                (char *)smsg->path_name, smsg->file_name);
+                 (char *)smsg->path_name, (char *)smsg->file_name);
 
         syslog(LOG_INFO, "Target file name: %s", target_fname);
         /*
@@ -137,7 +131,7 @@ void print_usage(char *argv[])
 
 int main(int argc, char *argv[])
 {
-        int fd, fcopy_fd, len;
+        int fcopy_fd, len;
         int error;
         int daemonize = 1, long_index = 0, opt;
         int version = FCOPY_CURRENT_VERSION;
diff --git a/tools/hv/hv_kvp_daemon.c b/tools/hv/hv_kvp_daemon.c
index 6a6432a20a1d..408bb076a234 100644
--- a/tools/hv/hv_kvp_daemon.c
+++ b/tools/hv/hv_kvp_daemon.c
@@ -147,7 +147,6 @@ static void kvp_release_lock(int pool)
 static void kvp_update_file(int pool)
 {
         FILE *filep;
-        size_t bytes_written;
 
         /*
          * We are going to write our in-memory registry out to
@@ -163,8 +162,7 @@ static void kvp_update_file(int pool)
                 exit(EXIT_FAILURE);
         }
 
-        bytes_written = fwrite(kvp_file_info[pool].records,
-                                sizeof(struct kvp_record),
+        fwrite(kvp_file_info[pool].records, sizeof(struct kvp_record),
                                 kvp_file_info[pool].num_records, filep);
 
         if (ferror(filep) || fclose(filep)) {
@@ -310,7 +308,7 @@ static int kvp_file_init(void)
         return 0;
 }
 
-static int kvp_key_delete(int pool, const char *key, int key_size)
+static int kvp_key_delete(int pool, const __u8 *key, int key_size)
 {
         int i;
         int j, k;
@@ -353,8 +351,8 @@ static int kvp_key_delete(int pool, const char *key, int key_size)
         return 1;
 }
 
-static int kvp_key_add_or_modify(int pool, const char *key, int key_size, const char *value,
-                        int value_size)
+static int kvp_key_add_or_modify(int pool, const __u8 *key, int key_size,
+                                 const __u8 *value, int value_size)
 {
         int i;
         int num_records;
@@ -407,7 +405,7 @@ static int kvp_key_add_or_modify(int pool, const char *key, int key_size, const
         return 0;
 }
 
-static int kvp_get_value(int pool, const char *key, int key_size, char *value,
+static int kvp_get_value(int pool, const __u8 *key, int key_size, __u8 *value,
                         int value_size)
 {
         int i;
@@ -439,8 +437,8 @@ static int kvp_get_value(int pool, const char *key, int key_size, char *value,
         return 1;
 }
 
-static int kvp_pool_enumerate(int pool, int index, char *key, int key_size,
-                                char *value, int value_size)
+static int kvp_pool_enumerate(int pool, int index, __u8 *key, int key_size,
+                                __u8 *value, int value_size)
 {
         struct kvp_record *record;
 
@@ -661,7 +659,7 @@ static char *kvp_if_name_to_mac(char *if_name)
         char    *p, *x;
         char    buf[256];
         char addr_file[256];
-        int i;
+        unsigned int i;
         char *mac_addr = NULL;
 
         snprintf(addr_file, sizeof(addr_file), "%s%s%s", "/sys/class/net/",
@@ -700,7 +698,7 @@ static char *kvp_mac_to_if_name(char *mac)
         char    buf[256];
         char *kvp_net_dir = "/sys/class/net/";
         char dev_id[256];
-        int i;
+        unsigned int i;
 
         dir = opendir(kvp_net_dir);
         if (dir == NULL)
@@ -750,7 +748,7 @@ static char *kvp_mac_to_if_name(char *mac)
 
 
 static void kvp_process_ipconfig_file(char *cmd,
-                                        char *config_buf, int len,
+                                        char *config_buf, unsigned int len,
                                         int element_size, int offset)
 {
         char buf[256];
@@ -768,7 +766,7 @@ static void kvp_process_ipconfig_file(char *cmd,
         if (offset == 0)
                 memset(config_buf, 0, len);
         while ((p = fgets(buf, sizeof(buf), file)) != NULL) {
-                if ((len - strlen(config_buf)) < (element_size + 1))
+                if (len < strlen(config_buf) + element_size + 1)
                         break;
 
                 x = strchr(p, '\n');
@@ -916,7 +914,7 @@ static int kvp_process_ip_address(void *addrp,
 
 static int
 kvp_get_ip_info(int family, char *if_name, int op,
-                 void  *out_buffer, int length)
+                 void  *out_buffer, unsigned int length)
 {
         struct ifaddrs *ifap;
         struct ifaddrs *curp;
@@ -1019,8 +1017,7 @@ kvp_get_ip_info(int family, char *if_name, int op,
                                         weight += hweight32(&w[i]);
 
                                 sprintf(cidr_mask, "/%d", weight);
-                                if ((length - sn_offset) <
-                                        (strlen(cidr_mask) + 1))
+                                if (length < sn_offset + strlen(cidr_mask) + 1)
                                         goto gather_ipaddr;
 
                                 if (sn_offset == 0)
@@ -1308,16 +1305,17 @@ static int kvp_set_ip_info(char *if_name, struct hv_kvp_ipaddr_value *new_val)
         if (error)
                 goto setval_error;
 
+        /*
+         * The dhcp_enabled flag is only for IPv4. In the case the host only
+         * injects an IPv6 address, the flag is true, but we still need to
+         * proceed to parse and pass the IPv6 information to the
+         * disto-specific script hv_set_ifconfig.
+         */
         if (new_val->dhcp_enabled) {
                 error = kvp_write_file(file, "BOOTPROTO", "", "dhcp");
                 if (error)
                         goto setval_error;
 
-                /*
-                 * We are done!.
-                 */
-                goto setval_done;
-
         } else {
                 error = kvp_write_file(file, "BOOTPROTO", "", "none");
                 if (error)
@@ -1345,7 +1343,6 @@ static int kvp_set_ip_info(char *if_name, struct hv_kvp_ipaddr_value *new_val)
         if (error)
                 goto setval_error;
 
-setval_done:
         fclose(file);
 
         /*