| From 64690a90cd7c6db16d3af8616be1f4bf8d492850 Mon Sep 17 00:00:00 2001 |
| From: Oliver Neukum <oneukum@suse.com> |
| Date: Thu, 17 Jul 2025 16:12:50 +0200 |
| Subject: cdc-acm: fix race between initial clearing halt and open |
| |
| From: Oliver Neukum <oneukum@suse.com> |
| |
| commit 64690a90cd7c6db16d3af8616be1f4bf8d492850 upstream. |
| |
| 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 | 11 ++++++----- |
| 1 file changed, 6 insertions(+), 5 deletions(-) |
| |
| --- a/drivers/usb/class/cdc-acm.c |
| +++ b/drivers/usb/class/cdc-acm.c |
| @@ -1496,6 +1496,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)) { |
| @@ -1503,11 +1509,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; |
