linux-stable.git/drivers/usb/class, branch v5.12.2

USB: CDC-ACM: fix poison/unpoison imbalance

2021-05-02T09:10:27+00:00

commit a8b3b519618f30a87a304c4e120267ce6f8dc68a upstream.

suspend() does its poisoning conditionally, resume() does it
unconditionally. On a device with combined interfaces this
will balance, on a device with two interfaces the counter will
go negative and resubmission will fail.

Both actions need to be done conditionally.

Fixes: 6069e3e927c8f ("USB: cdc-acm: untangle a circular dependency between callback and softint")
Signed-off-by: Oliver Neukum 
Cc: stable 
Link: https://lore.kernel.org/r/20210421074513.4327-1-oneukum@suse.com
Signed-off-by: Greg Kroah-Hartman 
Signed-off-by: Greg Kroah-Hartman

USB: cdc-acm: do not log successful probe on later errors

2021-03-23T12:27:13+00:00

Do not log the successful-probe message until the tty device has been
registered.

Signed-off-by: Johan Hovold 
Link: https://lore.kernel.org/r/20210322155318.9837-9-johan@kernel.org
Signed-off-by: Greg Kroah-Hartman

USB: cdc-acm: always claim data interface

2021-03-23T12:27:13+00:00

Make sure to always claim the data interface and bail out if binding
fails.

Note that the driver had a check to verify that the data interface was
not already bound to a driver but would not detect other failures (e.g.
if the interface was not authorised).

Signed-off-by: Johan Hovold 
Link: https://lore.kernel.org/r/20210322155318.9837-8-johan@kernel.org
Signed-off-by: Greg Kroah-Hartman

USB: cdc-acm: use negation for NULL checks

2021-03-23T12:27:13+00:00

Use negation consistently throughout the driver for NULL checks.

Acked-by: Oliver Neukum 
Signed-off-by: Johan Hovold 
Link: https://lore.kernel.org/r/20210322155318.9837-7-johan@kernel.org
Signed-off-by: Greg Kroah-Hartman

USB: cdc-acm: clean up probe error labels

2021-03-23T12:27:13+00:00

Name the probe error labels after what they do rather than using
sequence numbers which is harder to review and maintain (e.g. may
require renaming unrelated labels when a label is added or removed).

Acked-by: Oliver Neukum 
Signed-off-by: Johan Hovold 
Link: https://lore.kernel.org/r/20210322155318.9837-6-johan@kernel.org
Signed-off-by: Greg Kroah-Hartman

USB: cdc-acm: drop redundant driver-data reset

2021-03-23T12:27:13+00:00

There's no need to clear the interface driver data on failed probe (and
driver core will clear it anyway).

Acked-by: Oliver Neukum 
Signed-off-by: Johan Hovold 
Link: https://lore.kernel.org/r/20210322155318.9837-5-johan@kernel.org
Signed-off-by: Greg Kroah-Hartman

USB: cdc-acm: drop redundant driver-data assignment

2021-03-23T12:27:13+00:00

The interface driver data has already been set by
usb_driver_claim_interface() so drop the redundant subsequent
assignment.

Acked-by: Oliver Neukum 
Signed-off-by: Johan Hovold 
Link: https://lore.kernel.org/r/20210322155318.9837-4-johan@kernel.org
Signed-off-by: Greg Kroah-Hartman

USB: cdc-acm: fix use-after-free after probe failure

2021-03-23T12:27:13+00:00

If tty-device registration fails the driver would fail to release the
data interface. When the device is later disconnected, the disconnect
callback would still be called for the data interface and would go about
releasing already freed resources.

Fixes: c93d81955005 ("usb: cdc-acm: fix error handling in acm_probe()")
Cc: stable@vger.kernel.org      # 3.9
Cc: Alexey Khoroshilov 
Acked-by: Oliver Neukum 
Signed-off-by: Johan Hovold 
Link: https://lore.kernel.org/r/20210322155318.9837-3-johan@kernel.org
Signed-off-by: Greg Kroah-Hartman

USB: cdc-acm: fix double free on probe failure

2021-03-23T12:27:13+00:00

If tty-device registration fails the driver copy of any Country
Selection functional descriptor would end up being freed twice; first
explicitly in the error path and then again in the tty-port destructor.

Drop the first erroneous free that was left when fixing a tty-port
resource leak.

Fixes: cae2bc768d17 ("usb: cdc-acm: Decrement tty port's refcount if probe() fail")
Cc: stable@vger.kernel.org      # 4.19
Cc: Jaejoong Kim 
Acked-by: Oliver Neukum 
Signed-off-by: Johan Hovold 
Link: https://lore.kernel.org/r/20210322155318.9837-2-johan@kernel.org
Signed-off-by: Greg Kroah-Hartman

USB: cdc-acm: downgrade message to debug

2021-03-23T12:26:41+00:00

This failure is so common that logging an error here amounts
to spamming log files.

Reviewed-by: Bruno Thomsen 
Signed-off-by: Oliver Neukum 
Cc: stable 
Link: https://lore.kernel.org/r/20210311130126.15972-2-oneukum@suse.com
Signed-off-by: Greg Kroah-Hartman