1 files changed, 65 insertions, 20 deletions

diff --git a/drivers/usb/class/cdc-acm.c b/drivers/usb/class/cdc-acm.c
index 38f85b0e32ab..c653635ce5c2 100644
--- a/drivers/usb/class/cdc-acm.c
+++ b/drivers/usb/class/cdc-acm.c
@@ -160,17 +160,29 @@ static inline int acm_set_control(struct acm *acm, int control)
 #define acm_send_break(acm, ms) \
         acm_ctrl_msg(acm, USB_CDC_REQ_SEND_BREAK, ms, NULL, 0)
 
-static void acm_kill_urbs(struct acm *acm)
+static void acm_poison_urbs(struct acm *acm)
 {
         int i;
 
-        usb_kill_urb(acm->ctrlurb);
+        usb_poison_urb(acm->ctrlurb);
         for (i = 0; i < ACM_NW; i++)
-                usb_kill_urb(acm->wb[i].urb);
+                usb_poison_urb(acm->wb[i].urb);
         for (i = 0; i < acm->rx_buflimit; i++)
-                usb_kill_urb(acm->read_urbs[i]);
+                usb_poison_urb(acm->read_urbs[i]);
+}
+
+static void acm_unpoison_urbs(struct acm *acm)
+{
+        int i;
+
+        for (i = 0; i < acm->rx_buflimit; i++)
+                usb_unpoison_urb(acm->read_urbs[i]);
+        for (i = 0; i < ACM_NW; i++)
+                usb_unpoison_urb(acm->wb[i].urb);
+        usb_unpoison_urb(acm->ctrlurb);
 }
 
+
 /*
  * Write buffer management.
  * All of these assume proper locks taken by the caller.
@@ -238,9 +250,10 @@ static int acm_start_wb(struct acm *acm, struct acm_wb *wb)
 
         rc = usb_submit_urb(wb->urb, GFP_ATOMIC);
         if (rc < 0) {
-                dev_err(&acm->data->dev,
-                        "%s - usb_submit_urb(write bulk) failed: %d\n",
-                        __func__, rc);
+                if (rc != -EPERM)
+                        dev_err(&acm->data->dev,
+                                "%s - usb_submit_urb(write bulk) failed: %d\n",
+                                __func__, rc);
                 acm_write_done(acm, wb);
         }
         return rc;
@@ -324,8 +337,10 @@ static void acm_process_notification(struct acm *acm, unsigned char *buf)
                         acm->iocount.dsr++;
                 if (difference & ACM_CTRL_DCD)
                         acm->iocount.dcd++;
-                if (newctrl & ACM_CTRL_BRK)
+                if (newctrl & ACM_CTRL_BRK) {
                         acm->iocount.brk++;
+                        tty_insert_flip_char(&acm->port, 0, TTY_BREAK);
+                }
                 if (newctrl & ACM_CTRL_RI)
                         acm->iocount.rng++;
                 if (newctrl & ACM_CTRL_FRAMING)
@@ -336,6 +351,9 @@ static void acm_process_notification(struct acm *acm, unsigned char *buf)
                         acm->iocount.overrun++;
                 spin_unlock(&acm->read_lock);
 
+                if (newctrl & ACM_CTRL_BRK)
+                        tty_flip_buffer_push(&acm->port);
+
                 if (difference)
                         wake_up_all(&acm->wioctl);
 
@@ -471,11 +489,16 @@ static int acm_submit_read_urbs(struct acm *acm, gfp_t mem_flags)
 
 static void acm_process_read_urb(struct acm *acm, struct urb *urb)
 {
+        unsigned long flags;
+
         if (!urb->actual_length)
                 return;
 
+        spin_lock_irqsave(&acm->read_lock, flags);
         tty_insert_flip_string(&acm->port, urb->transfer_buffer,
                         urb->actual_length);
+        spin_unlock_irqrestore(&acm->read_lock, flags);
+
         tty_flip_buffer_push(&acm->port);
 }
 
@@ -492,11 +515,6 @@ static void acm_read_bulk_callback(struct urb *urb)
         dev_vdbg(&acm->data->dev, "got urb %d, len %d, status %d\n",
                 rb->index, urb->actual_length, status);
 
-        if (!acm->dev) {
-                dev_dbg(&acm->data->dev, "%s - disconnected\n", __func__);
-                return;
-        }
-
         switch (status) {
         case 0:
                 usb_mark_last_busy(acm->dev);
@@ -666,7 +684,8 @@ static void acm_port_dtr_rts(struct tty_port *port, int raise)
 
         res = acm_set_control(acm, val);
         if (res && (acm->ctrl_caps & USB_CDC_CAP_LINE))
-                dev_err(&acm->control->dev, "failed to set dtr/rts\n");
+                /* This is broken in too many devices to spam the logs */
+                dev_dbg(&acm->control->dev, "failed to set dtr/rts\n");
 }
 
 static int acm_port_activate(struct tty_port *port, struct tty_struct *tty)
@@ -751,6 +770,7 @@ static void acm_port_shutdown(struct tty_port *port)
          * Need to grab write_lock to prevent race with resume, but no need to
          * hold it due to the tty-port initialised flag.
          */
+        acm_poison_urbs(acm);
         spin_lock_irq(&acm->write_lock);
         spin_unlock_irq(&acm->write_lock);
 
@@ -767,7 +787,8 @@ static void acm_port_shutdown(struct tty_port *port)
                 usb_autopm_put_interface_async(acm->control);
         }
 
-        acm_kill_urbs(acm);
+        acm_unpoison_urbs(acm);
+
 }
 
 static void acm_tty_cleanup(struct tty_struct *tty)
@@ -986,8 +1007,6 @@ static int set_serial_info(struct acm *acm,
                 if ((new_serial.close_delay != old_close_delay) ||
                     (new_serial.closing_wait != old_closing_wait))
                         retval = -EPERM;
-                else
-                        retval = -EOPNOTSUPP;
         } else {
                 acm->port.close_delay  = close_delay;
                 acm->port.closing_wait = closing_wait;
@@ -1559,6 +1578,11 @@ skip_countries:
 
         return 0;
 alloc_fail8:
+        if (!acm->combined_interfaces) {
+                /* Clear driver data so that disconnect() returns early. */
+                usb_set_intfdata(data_interface, NULL);
+                usb_driver_release_interface(&acm_driver, data_interface);
+        }
         if (acm->country_codes) {
                 device_remove_file(&acm->control->dev,
                                 &dev_attr_wCountryCodes);
@@ -1598,8 +1622,14 @@ static void acm_disconnect(struct usb_interface *intf)
         if (!acm)
                 return;
 
-        mutex_lock(&acm->mutex);
         acm->disconnected = true;
+        /*
+         * there is a circular dependency. acm_softint() can resubmit
+         * the URBs in error handling so we need to block any
+         * submission right away
+         */
+        acm_poison_urbs(acm);
+        mutex_lock(&acm->mutex);
         if (acm->country_codes) {
                 device_remove_file(&acm->control->dev,
                                 &dev_attr_wCountryCodes);
@@ -1618,7 +1648,6 @@ static void acm_disconnect(struct usb_interface *intf)
                 tty_kref_put(tty);
         }
 
-        acm_kill_urbs(acm);
         cancel_delayed_work_sync(&acm->dwork);
 
         tty_unregister_device(acm_tty_driver, acm->minor);
@@ -1660,7 +1689,7 @@ static int acm_suspend(struct usb_interface *intf, pm_message_t message)
         if (cnt)
                 return 0;
 
-        acm_kill_urbs(acm);
+        acm_poison_urbs(acm);
         cancel_delayed_work_sync(&acm->dwork);
         acm->urbs_in_error_delay = 0;
 
@@ -1678,6 +1707,8 @@ static int acm_resume(struct usb_interface *intf)
         if (--acm->susp_count)
                 goto out;
 
+        acm_unpoison_urbs(acm);
+
         if (tty_port_initialized(&acm->port)) {
                 rv = usb_submit_urb(acm->ctrlurb, GFP_ATOMIC);
 
@@ -1952,6 +1983,10 @@ static const struct usb_device_id acm_ids[] = {
         { USB_DEVICE(0x04d8, 0x0083),   /* Bootloader mode */
         .driver_info = IGNORE_DEVICE,
         },
+
+        { USB_DEVICE(0x04d8, 0xf58b),
+        .driver_info = IGNORE_DEVICE,
+        },
 #endif
 
         /*Samsung phone in firmware update mode */
@@ -1982,6 +2017,16 @@ static const struct usb_device_id acm_ids[] = {
         .driver_info = SEND_ZERO_PACKET,
         },
 
+        /* Exclude Goodix Fingerprint Reader */
+        { USB_DEVICE(0x27c6, 0x5395),
+        .driver_info = IGNORE_DEVICE,
+        },
+
+        /* Exclude Heimann Sensor GmbH USB appset demo */
+        { USB_DEVICE(0x32a7, 0x0000),
+        .driver_info = IGNORE_DEVICE,
+        },
+
         /* control interfaces without any protocol set */
         { USB_INTERFACE_INFO(USB_CLASS_COMM, USB_CDC_SUBCLASS_ACM,
                 USB_CDC_PROTO_NONE) },