This is a note to let you know that I've just added the patch titled
USB: oti6858: fix use-after-free in TIOCMIWAIT
to the 3.8-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
usb-oti6858-fix-use-after-free-in-tiocmiwait.patch
and it can be found in the queue-3.8 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <[email protected]> know about it.
>From 8edfdab37157d2683e51b8be5d3d5697f66a9f7b Mon Sep 17 00:00:00 2001
From: Johan Hovold <[email protected]>
Date: Tue, 19 Mar 2013 09:21:21 +0100
Subject: USB: oti6858: fix use-after-free in TIOCMIWAIT
From: Johan Hovold <[email protected]>
commit 8edfdab37157d2683e51b8be5d3d5697f66a9f7b upstream.
Use the port wait queue and make sure to check the serial disconnected
flag before accessing private port data after waking up.
This is is needed as the private port data (including the wait queue
itself) can be gone when waking up after a disconnect.
Signed-off-by: Johan Hovold <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>
---
drivers/usb/serial/oti6858.c | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
--- a/drivers/usb/serial/oti6858.c
+++ b/drivers/usb/serial/oti6858.c
@@ -188,7 +188,6 @@ struct oti6858_private {
u8 setup_done;
struct delayed_work delayed_setup_work;
- wait_queue_head_t intr_wait;
struct usb_serial_port *port; /* USB port with which associated */
};
@@ -339,7 +338,6 @@ static int oti6858_port_probe(struct usb
return -ENOMEM;
spin_lock_init(&priv->lock);
- init_waitqueue_head(&priv->intr_wait);
priv->port = port;
INIT_DELAYED_WORK(&priv->delayed_setup_work, setup_line);
INIT_DELAYED_WORK(&priv->delayed_write_work, send_data);
@@ -664,11 +662,15 @@ static int wait_modem_info(struct usb_se
spin_unlock_irqrestore(&priv->lock, flags);
while (1) {
- wait_event_interruptible(priv->intr_wait,
+ wait_event_interruptible(port->delta_msr_wait,
+ port->serial->disconnected ||
priv->status.pin_state != prev);
if (signal_pending(current))
return -ERESTARTSYS;
+ if (port->serial->disconnected)
+ return -EIO;
+
spin_lock_irqsave(&priv->lock, flags);
status = priv->status.pin_state & PIN_MASK;
spin_unlock_irqrestore(&priv->lock, flags);
@@ -763,7 +765,7 @@ static void oti6858_read_int_callback(st
if (!priv->transient) {
if (xs->pin_state != priv->status.pin_state)
- wake_up_interruptible(&priv->intr_wait);
+ wake_up_interruptible(&port->delta_msr_wait);
memcpy(&priv->status, xs, OTI6858_CTRL_PKT_SIZE);
}
Patches currently in stable-queue which might be from [email protected] are
queue-3.8/usb-quatech2-fix-use-after-free-in-tiocmiwait.patch
queue-3.8/usb-ark3116-fix-use-after-free-in-tiocmiwait.patch
queue-3.8/usb-cypress_m8-fix-use-after-free-in-tiocmiwait.patch
queue-3.8/usb-pl2303-fix-use-after-free-in-tiocmiwait.patch
queue-3.8/usb-io_edgeport-fix-use-after-free-in-tiocmiwait.patch
queue-3.8/usb-ch341-fix-use-after-free-in-tiocmiwait.patch
queue-3.8/usb-mos7840-fix-broken-tiocmiwait.patch
queue-3.8/usb-spcp8x5-fix-use-after-free-in-tiocmiwait.patch
queue-3.8/usb-ti_usb_3410_5052-fix-use-after-free-in-tiocmiwait.patch
queue-3.8/usb-serial-fix-hang-when-opening-port.patch
queue-3.8/usb-f81232-fix-use-after-free-in-tiocmiwait.patch
queue-3.8/usb-mct_u232-fix-use-after-free-in-tiocmiwait.patch
queue-3.8/usb-oti6858-fix-use-after-free-in-tiocmiwait.patch
queue-3.8/usb-ftdi_sio-fix-use-after-free-in-tiocmiwait.patch
queue-3.8/usb-serial-add-modem-status-change-wait-queue.patch
queue-3.8/usb-io_ti-fix-use-after-free-in-tiocmiwait.patch
queue-3.8/usb-ssu100-fix-use-after-free-in-tiocmiwait.patch
queue-3.8/usb-mos7840-fix-use-after-free-in-tiocmiwait.patch
--
To unsubscribe from this list: send the line "unsubscribe stable" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
