patch "usb: cdc-acm: make sure a refcount is taken early enough" added to usb-linus
Subsystems (3)
This is a note to let you know that I've just added the patch titled
usb: cdc-acm: make sure a refcount is taken early enough
to my usb git tree which can be found at
git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git
in the usb-linus branch.
The patch will show up in the next release of the linux-next tree (usually sometime within the next 24 hours during the week.)
The patch will hopefully also be merged in Linus's tree for the next -rc kernel release.
If you have any questions about this process, please let me know.
From c52873e5a1ef72f845526d9f6a50704433f9c625 Mon Sep 17 00:00:00 2001
From: Oliver Neukum <[email protected]>
Date: Thu, 8 Aug 2019 16:21:19 +0200
Subject: usb: cdc-acm: make sure a refcount is taken early enough
destroy() will decrement the refcount on the interface, so that it needs to be taken so early that it never undercounts.
--- drivers/usb/class/cdc-acm.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-)
drivers/usb/class/cdc-acm.c +7 -5
@@ -1301,10 +1301,6 @@ static int acm_probe(struct usb_interface *intf,tty_port_init (&acm->port); acm->port.ops = &acm_port_ops; - minor =acm_alloc_minor (acm); -if (minor <0 ) - goto alloc_fail1; - ctrlsize =usb_endpoint_maxp (epctrl); readsize =usb_endpoint_maxp (epread) * (quirks ==SINGLE_RX_URB ?1 :2 );
@@ -1312,6 +1308,13 @@ static int acm_probe(struct usb_interface *intf, acm->writesize =usb_endpoint_maxp (epwrite) *20 ; acm->control = control_interface; acm->data = data_interface; + +usb_get_intf (acm->control);/* undone in destruct() */ + + minor =acm_alloc_minor (acm); +if (minor <0 ) + goto alloc_fail1; + acm->minor = minor; acm->dev = usb_dev;if (h.usb_cdc_acm_descriptor)
@@ -1458,7 +1461,6 @@ static int acm_probe(struct usb_interface *intf,usb_driver_claim_interface (&acm_driver, data_interface, acm);usb_set_intfdata (data_interface, acm); -usb_get_intf (control_interface); tty_dev =tty_port_register_device (&acm->port, acm_tty_driver, minor, &control_interface->dev);if (IS_ERR (tty_dev)) {
Signature · 1 line
2.22.1