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

Pull USB/PHY updates from Greg KH:
 "Here is the big USB and PHY driver update for 4.16-rc1.

  Along with the normally expected XHCI, MUSB, and Gadget driver
  patches, there are some PHY driver fixes, license cleanups, sysfs
  attribute cleanups, usbip changes, and a raft of other smaller fixes
  and additions.

  Full details are in the shortlog.

  All of these have been in the linux-next tree for a long time with no
  reported issues"

* tag 'usb-4.16-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb: (137 commits)
  USB: serial: pl2303: new device id for Chilitag
  USB: misc: fix up some remaining DEVICE_ATTR() usages
  USB: musb: fix up one odd DEVICE_ATTR() usage
  USB: atm: fix up some remaining DEVICE_ATTR() usage
  USB: move many drivers to use DEVICE_ATTR_WO
  USB: move many drivers to use DEVICE_ATTR_RO
  USB: move many drivers to use DEVICE_ATTR_RW
  USB: misc: chaoskey: Use true and false for boolean values
  USB: storage: remove old wording about how to submit a change
  USB: storage: remove invalid URL from drivers
  usb: ehci-omap: don't complain on -EPROBE_DEFER when no PHY found
  usbip: list: don't list devices attached to vhci_hcd
  usbip: prevent bind loops on devices attached to vhci_hcd
  USB: serial: remove redundant initializations of 'mos_parport'
  usb/gadget: Fix "high bandwidth" check in usb_gadget_ep_match_desc()
  usb: gadget: compress return logic into one line
  usbip: vhci_hcd: update 'status' file header and format
  USB: serial: simple: add Motorola Tetra driver
  CDC-ACM: apply quirk for card reader
  usb: option: Add support for FS040U modem
  ...

4 files changed, 24 insertions, 3 deletions

diff --git a/tools/usb/usbip/libsrc/usbip_device_driver.c b/tools/usb/usbip/libsrc/usbip_device_driver.c
index e059b7d1ec5b..ec3a0b794f15 100644
--- a/tools/usb/usbip/libsrc/usbip_device_driver.c
+++ b/tools/usb/usbip/libsrc/usbip_device_driver.c
@@ -77,7 +77,7 @@ int read_usb_vudc_device(struct udev_device *sdev, struct usbip_usb_device *dev)
         const char *path, *name;
         char filepath[SYSFS_PATH_MAX];
         struct usb_device_descriptor descr;
-        unsigned i;
+        unsigned int i;
         FILE *fd = NULL;
         struct udev_device *plat;
         const char *speed;
@@ -92,7 +92,7 @@ int read_usb_vudc_device(struct udev_device *sdev, struct usbip_usb_device *dev)
                 return -1;
         ret = fread((char *) &descr, sizeof(descr), 1, fd);
         if (ret < 0)
-                return -1;
+                goto err;
         fclose(fd);
 
         copy_descr_attr(dev, &descr, bDeviceClass);
@@ -124,6 +124,9 @@ int read_usb_vudc_device(struct udev_device *sdev, struct usbip_usb_device *dev)
         name = udev_device_get_sysname(plat);
         strncpy(dev->busid, name, SYSFS_BUS_ID_SIZE);
         return 0;
+err:
+        fclose(fd);
+        return -1;
 }
 
 static int is_my_device(struct udev_device *dev)
diff --git a/tools/usb/usbip/src/usbip_bind.c b/tools/usb/usbip/src/usbip_bind.c
index fa46141ae68b..e121cfb1746a 100644
--- a/tools/usb/usbip/src/usbip_bind.c
+++ b/tools/usb/usbip/src/usbip_bind.c
@@ -144,6 +144,7 @@ static int bind_device(char *busid)
         int rc;
         struct udev *udev;
         struct udev_device *dev;
+        const char *devpath;
 
         /* Check whether the device with this bus ID exists. */
         udev = udev_new();
@@ -152,8 +153,16 @@ static int bind_device(char *busid)
                 err("device with the specified bus ID does not exist");
                 return -1;
         }
+        devpath = udev_device_get_devpath(dev);
         udev_unref(udev);
 
+        /* If the device is already attached to vhci_hcd - bail out */
+        if (strstr(devpath, USBIP_VHCI_DRV_NAME)) {
+                err("bind loop detected: device: %s is attached to %s\n",
+                    devpath, USBIP_VHCI_DRV_NAME);
+                return -1;
+        }
+
         rc = unbind_other(busid);
         if (rc == UNBIND_ST_FAILED) {
                 err("could not unbind driver from device on busid %s", busid);
diff --git a/tools/usb/usbip/src/usbip_list.c b/tools/usb/usbip/src/usbip_list.c
index f1b38e866dd7..d65a9f444174 100644
--- a/tools/usb/usbip/src/usbip_list.c
+++ b/tools/usb/usbip/src/usbip_list.c
@@ -187,6 +187,7 @@ static int list_devices(bool parsable)
         const char *busid;
         char product_name[128];
         int ret = -1;
+        const char *devpath;
 
         /* Create libudev context. */
         udev = udev_new();
@@ -209,6 +210,14 @@ static int list_devices(bool parsable)
                 path = udev_list_entry_get_name(dev_list_entry);
                 dev = udev_device_new_from_syspath(udev, path);
 
+                /* Ignore devices attached to vhci_hcd */
+                devpath = udev_device_get_devpath(dev);
+                if (strstr(devpath, USBIP_VHCI_DRV_NAME)) {
+                        dbg("Skip the device %s already attached to %s\n",
+                            devpath, USBIP_VHCI_DRV_NAME);
+                        continue;
+                }
+
                 /* Get device information. */
                 idVendor = udev_device_get_sysattr_value(dev, "idVendor");
                 idProduct = udev_device_get_sysattr_value(dev, "idProduct");
diff --git a/tools/usb/usbip/src/usbipd.c b/tools/usb/usbip/src/usbipd.c
index 009afb4a3aae..c6dad2a13c80 100644
--- a/tools/usb/usbip/src/usbipd.c
+++ b/tools/usb/usbip/src/usbipd.c
@@ -456,7 +456,7 @@ static void set_signal(void)
         sigaction(SIGTERM, &act, NULL);
         sigaction(SIGINT, &act, NULL);
         act.sa_handler = SIG_IGN;
-        sigaction(SIGCLD, &act, NULL);
+        sigaction(SIGCHLD, &act, NULL);
 }
 
 static const char *pid_file;