Merge tag 'usb-4.12-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb

Pull USB updates from Greg KH:
 "Here is the big USB patchset for 4.12-rc1.

  Lots of good stuff here, after many many many attempts, the kernel
  finally has a working typeC interface, many thanks to Heikki and
  Guenter and others who have taken the time to get this merged. It
  wasn't an easy path for them at all.

  There's also a staging driver that uses this new api, which is why
  it's coming in through this tree.

  Along with that, there's the usual huge number of changes for gadget
  drivers, xhci, and other stuff. Johan also finally refactored pretty
  much every driver that was looking at USB endpoints to do it in a
  common way, which will help prevent any "badly-formed" devices from
  causing problems in drivers. That too wasn't a simple task.

  All of these have been in linux-next for a while with no reported
  issues"

* tag 'usb-4.12-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb: (263 commits)
  staging: typec: Fairchild FUSB302 Type-c chip driver
  staging: typec: Type-C Port Controller Interface driver (tcpci)
  staging: typec: USB Type-C Port Manager (tcpm)
  usb: host: xhci: remove #ifdef around PM functions
  usb: musb: don't mark of_dev_auxdata as initdata
  usb: misc: legousbtower: Fix buffers on stack
  USB: Revert "cdc-wdm: fix "out-of-sync" due to missing notifications"
  usb: Make sure usb/phy/of gets built-in
  USB: storage: e-mail update in drivers/usb/storage/unusual_devs.h
  usb: host: xhci: print correct command ring address
  usb: host: xhci: delete sp_dma_buffers for scratchpad
  usb: host: xhci: using correct specification chapter reference for DCBAAP
  xhci: switch to pci_alloc_irq_vectors
  usb: host: xhci-plat: set resume_quirk() for R-Car controllers
  usb: host: xhci-plat: add resume_quirk()
  usb: host: xhci-plat: enable clk in resume timing
  usb: host: plat: Enable xHCI plat runtime PM
  USB: serial: ftdi_sio: add device ID for Microsemi/Arrow SF2PLUS Dev Kit
  USB: serial: constify static arrays
  usb: fix some references for /proc/bus/usb
  ...

6 files changed, 41 insertions, 30 deletions

diff --git a/tools/usb/.gitignore b/tools/usb/.gitignore
new file mode 100644
index 000000000000..1b7448981435
--- /dev/null
+++ b/tools/usb/.gitignore
@@ -0,0 +1,2 @@
+ffs-test
+testusb
diff --git a/tools/usb/usbip/README b/tools/usb/usbip/README
index 5eb2b6c7722b..7844490fc603 100644
--- a/tools/usb/usbip/README
+++ b/tools/usb/usbip/README
@@ -244,7 +244,7 @@ Detach the imported device:
     - See 'Debug Tips' on the project wiki.
         - http://usbip.wiki.sourceforge.net/how-to-debug-usbip
     - usbip-host.ko must be bound to the target device.
-        - See /proc/bus/usb/devices and find "Driver=..." lines of the device.
+        - See /sys/kernel/debug/usb/devices and find "Driver=..." lines of the device.
     - Target USB gadget must be bound to vudc
       (using USB gadget susbsys, not usbip bind command)
     - Shutdown firewall.
diff --git a/tools/usb/usbip/libsrc/usbip_common.c b/tools/usb/usbip/libsrc/usbip_common.c
index ac73710473de..1517a232ab18 100644
--- a/tools/usb/usbip/libsrc/usbip_common.c
+++ b/tools/usb/usbip/libsrc/usbip_common.c
@@ -215,9 +215,16 @@ int read_usb_interface(struct usbip_usb_device *udev, int i,
                        struct usbip_usb_interface *uinf)
 {
         char busid[SYSFS_BUS_ID_SIZE];
+        int size;
         struct udev_device *sif;
 
-        sprintf(busid, "%s:%d.%d", udev->busid, udev->bConfigurationValue, i);
+        size = snprintf(busid, sizeof(busid), "%s:%d.%d",
+                        udev->busid, udev->bConfigurationValue, i);
+        if (size < 0 || (unsigned int)size >= sizeof(busid)) {
+                err("busid length %i >= %lu or < 0", size,
+                    (long unsigned)sizeof(busid));
+                return -1;
+        }
 
         sif = udev_device_new_from_subsystem_sysname(udev_context, "usb", busid);
         if (!sif) {
diff --git a/tools/usb/usbip/libsrc/usbip_host_common.c b/tools/usb/usbip/libsrc/usbip_host_common.c
index 9d415228883d..6ff7b601f854 100644
--- a/tools/usb/usbip/libsrc/usbip_host_common.c
+++ b/tools/usb/usbip/libsrc/usbip_host_common.c
@@ -40,13 +40,20 @@ struct udev *udev_context;
 static int32_t read_attr_usbip_status(struct usbip_usb_device *udev)
 {
         char status_attr_path[SYSFS_PATH_MAX];
+        int size;
         int fd;
         int length;
         char status;
         int value = 0;
 
-        snprintf(status_attr_path, SYSFS_PATH_MAX, "%s/usbip_status",
-                 udev->path);
+        size = snprintf(status_attr_path, sizeof(status_attr_path),
+                        "%s/usbip_status", udev->path);
+        if (size < 0 || (unsigned int)size >= sizeof(status_attr_path)) {
+                err("usbip_status path length %i >= %lu or < 0", size,
+                    (long unsigned)sizeof(status_attr_path));
+                return -1;
+        }
+
 
         fd = open(status_attr_path, O_RDONLY);
         if (fd < 0) {
@@ -218,6 +225,7 @@ int usbip_export_device(struct usbip_exported_device *edev, int sockfd)
 {
         char attr_name[] = "usbip_sockfd";
         char sockfd_attr_path[SYSFS_PATH_MAX];
+        int size;
         char sockfd_buff[30];
         int ret;
 
@@ -237,10 +245,20 @@ int usbip_export_device(struct usbip_exported_device *edev, int sockfd)
         }
 
         /* only the first interface is true */
-        snprintf(sockfd_attr_path, sizeof(sockfd_attr_path), "%s/%s",
-                 edev->udev.path, attr_name);
+        size = snprintf(sockfd_attr_path, sizeof(sockfd_attr_path), "%s/%s",
+                        edev->udev.path, attr_name);
+        if (size < 0 || (unsigned int)size >= sizeof(sockfd_attr_path)) {
+                err("exported device path length %i >= %lu or < 0", size,
+                    (long unsigned)sizeof(sockfd_attr_path));
+                return -1;
+        }
 
-        snprintf(sockfd_buff, sizeof(sockfd_buff), "%d\n", sockfd);
+        size = snprintf(sockfd_buff, sizeof(sockfd_buff), "%d\n", sockfd);
+        if (size < 0 || (unsigned int)size >= sizeof(sockfd_buff)) {
+                err("socket length %i >= %lu or < 0", size,
+                    (long unsigned)sizeof(sockfd_buff));
+                return -1;
+        }
 
         ret = write_sysfs_attribute(sockfd_attr_path, sockfd_buff,
                                     strlen(sockfd_buff));
diff --git a/tools/usb/usbip/libsrc/vhci_driver.c b/tools/usb/usbip/libsrc/vhci_driver.c
index ad9204773533..f659c146cdc8 100644
--- a/tools/usb/usbip/libsrc/vhci_driver.c
+++ b/tools/usb/usbip/libsrc/vhci_driver.c
@@ -123,33 +123,15 @@ static int refresh_imported_device_list(void)
 
 static int get_nports(void)
 {
-        char *c;
-        int nports = 0;
-        const char *attr_status;
+        const char *attr_nports;
 
-        attr_status = udev_device_get_sysattr_value(vhci_driver->hc_device,
-                                               "status");
-        if (!attr_status) {
-                err("udev_device_get_sysattr_value failed");
+        attr_nports = udev_device_get_sysattr_value(vhci_driver->hc_device, "nports");
+        if (!attr_nports) {
+                err("udev_device_get_sysattr_value nports failed");
                 return -1;
         }
 
-        /* skip a header line */
-        c = strchr(attr_status, '\n');
-        if (!c)
-                return 0;
-        c++;
-
-        while (*c != '\0') {
-                /* go to the next line */
-                c = strchr(c, '\n');
-                if (!c)
-                        return nports;
-                c++;
-                nports += 1;
-        }
-
-        return nports;
+        return (int)strtoul(attr_nports, NULL, 10);
 }
 
 /*
diff --git a/tools/usb/usbip/src/usbip.c b/tools/usb/usbip/src/usbip.c
index d7599d943529..73d8eee8130b 100644
--- a/tools/usb/usbip/src/usbip.c
+++ b/tools/usb/usbip/src/usbip.c
@@ -176,6 +176,8 @@ int main(int argc, char *argv[])
                         break;
                 case '?':
                         printf("usbip: invalid option\n");
+                        /* Terminate after printing error */
+                        /* FALLTHRU */
                 default:
                         usbip_usage();
                         goto out;