]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
USB: cdc-acm: fix break reporting
authorJohan Hovold <johan@kernel.org>
Wed, 29 Sep 2021 09:09:37 +0000 (11:09 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sun, 17 Oct 2021 08:04:43 +0000 (10:04 +0200)
commit 58fc1daa4d2e9789b9ffc880907c961ea7c062cc upstream.

A recent change that started reporting break events forgot to push the
event to the line discipline, which meant that a detected break would
not be reported until further characters had been receive (the port
could even have been closed and reopened in between).

Fixes: 08dff274edda ("cdc-acm: fix BREAK rx code path adding necessary calls")
Cc: stable@vger.kernel.org
Acked-by: Oliver Neukum <oneukum@suse.com>
Signed-off-by: Johan Hovold <johan@kernel.org>
Link: https://lore.kernel.org/r/20210929090937.7410-3-johan@kernel.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/usb/class/cdc-acm.c

index aa4028c551e1f423123a3b7b505dc1f258cec816..d869f37b1d23e50734e20395dc254c8737a06c24 100644 (file)
@@ -348,6 +348,9 @@ static void acm_ctrl_irq(struct urb *urb)
                        acm->iocount.overrun++;
                spin_unlock(&acm->read_lock);
 
+               if (newctrl & ACM_CTRL_BRK)
+                       tty_flip_buffer_push(&acm->port);
+
                if (difference)
                        wake_up_all(&acm->wioctl);