]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
cdc-acm: fix race between initial clearing halt and open
authorOliver Neukum <oneukum@suse.com>
Thu, 17 Jul 2025 14:12:50 +0000 (16:12 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 21 Jul 2025 14:29:44 +0000 (16:29 +0200)
On the devices that need their endpoints to get an
initial clear_halt, this needs to be done before
the devices can be opened. That means it needs to be
before the devices are registered.

Fixes: 15bf722e6f6c0 ("cdc-acm: Add support of ATOL FPrint fiscal printers")
Cc: stable <stable@kernel.org>
Signed-off-by: Oliver Neukum <oneukum@suse.com>
Link: https://lore.kernel.org/r/20250717141259.2345605-1-oneukum@suse.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/usb/class/cdc-acm.c

index c2ecfa3c83496fcbd97af815c500f2d4044a36ca..5a334e370f4d66b4d896dc3fc0524284b3467c2b 100644 (file)
@@ -1520,6 +1520,12 @@ skip_countries:
                        goto err_remove_files;
        }
 
+       if (quirks & CLEAR_HALT_CONDITIONS) {
+               /* errors intentionally ignored */
+               usb_clear_halt(usb_dev, acm->in);
+               usb_clear_halt(usb_dev, acm->out);
+       }
+
        tty_dev = tty_port_register_device(&acm->port, acm_tty_driver, minor,
                        &control_interface->dev);
        if (IS_ERR(tty_dev)) {
@@ -1527,11 +1533,6 @@ skip_countries:
                goto err_release_data_interface;
        }
 
-       if (quirks & CLEAR_HALT_CONDITIONS) {
-               usb_clear_halt(usb_dev, acm->in);
-               usb_clear_halt(usb_dev, acm->out);
-       }
-
        dev_info(&intf->dev, "ttyACM%d: USB ACM device\n", minor);
 
        return 0;