Commit 35b7c12b authored by Romain Izard's avatar Romain Izard Committed by Greg Kroah-Hartman

usb: cdc-acm: fix race during wakeup blocking TX traffic

commit 93e1c8a638308980309e009cc40b5a57ef87caf1 upstream.

When the kernel is compiled with preemption enabled, the URB completion
handler can run in parallel with the work responsible for waking up the
tty layer. If the URB handler sets the EVENT_TTY_WAKEUP bit during the
call to tty_port_tty_wakeup() to signal that there is room for additional
input, it will be cleared at the end of this call. As a result, TX traffic
on the upper layer will be blocked.

This can be seen with a kernel configured with CONFIG_PREEMPT, and a fast
modem connected with PPP running over a USB CDC-ACM port.

Use test_and_clear_bit() instead, which ensures that each wakeup requested
by the URB completion code will trigger a call to tty_port_tty_wakeup().

Fixes: 1aba579f cdc-acm: handle read pipe errors
Signed-off-by: default avatarRomain Izard <>
Cc: stable <>
Acked-by: default avatarOliver Neukum <>
Signed-off-by: default avatarGreg Kroah-Hartman <>
parent 09fa576a
......@@ -570,10 +570,8 @@ static void acm_softint(struct work_struct *work)
clear_bit(EVENT_RX_STALL, &acm->flags);
if (test_bit(EVENT_TTY_WAKEUP, &acm->flags)) {
if (test_and_clear_bit(EVENT_TTY_WAKEUP, &acm->flags))
clear_bit(EVENT_TTY_WAKEUP, &acm->flags);
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment