]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
USB: serial: keyspan_pda: fix tx-unthrottle use-after-free
authorJohan Hovold <johan@kernel.org>
Sun, 25 Oct 2020 17:45:51 +0000 (18:45 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 29 Dec 2020 12:42:43 +0000 (13:42 +0100)
commit 49fbb8e37a961396a5b6c82937c70df91de45e9d upstream.

The driver's transmit-unthrottle work was never flushed on disconnect,
something which could lead to the driver port data being freed while the
unthrottle work is still scheduled.

Fix this by cancelling the unthrottle work when shutting down the port.

Fixes: 1da177e4c3f4 ("Linux-2.6.12-rc2")
Cc: stable@vger.kernel.org
Acked-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Reviewed-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Johan Hovold <johan@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/usb/serial/keyspan_pda.c

index ef2e6ffe2a7a3b58f4099db8a9f32bb9ecaeae71..3a7cb1ae1950c3825e3e96b3de4915f1ab812a88 100644 (file)
@@ -651,8 +651,12 @@ error:
 }
 static void keyspan_pda_close(struct usb_serial_port *port)
 {
+       struct keyspan_pda_private *priv = usb_get_serial_port_data(port);
+
        usb_kill_urb(port->write_urb);
        usb_kill_urb(port->interrupt_in_urb);
+
+       cancel_work_sync(&priv->unthrottle_work);
 }